Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1045717

Browse filesBrowse files
minor #28258 [travis] fix composer.lock invalidation for deps=low (nicolas-grekas)
This PR was merged into the 2.8 branch. Discussion ---------- [travis] fix composer.lock invalidation for deps=low | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 41ffba1 [travis] fix composer.lock invalidation for deps=low
1 parent a19c6ae commit 1045717
Copy full SHA for 1045717

File tree

Expand file treeCollapse file tree

1 file changed

+2
-2
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+2
-2
lines changed

‎.github/rm-invalid-lowest-lock-files.php

Copy file name to clipboardExpand all lines: .github/rm-invalid-lowest-lock-files.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ function getContentHash(array $composerJson)
4848

4949
foreach ($dirs as $dir) {
5050
if (!file_exists($dir.'/composer.lock') || !$composerLock = @json_decode(file_get_contents($dir.'/composer.lock'), true)) {
51-
echo "$dir/composer.lock not found or invalid.\n";
5251
@unlink($dir.'/composer.lock');
5352
continue;
5453
}
@@ -62,7 +61,8 @@ function getContentHash(array $composerJson)
6261
@unlink($dir.'/composer.lock');
6362
continue;
6463
}
65-
$composerJsons[$composerJson['name']] = array($dir, $composerLock['packages'], getRelevantContent($composerJson));
64+
$composerLock += array('packages' => array(), 'packages-dev' => array());
65+
$composerJsons[$composerJson['name']] = array($dir, $composerLock['packages'] + $composerLock['packages-dev'], getRelevantContent($composerJson));
6666
}
6767

6868
$referencedCommits = array();

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.