minor #28258 [travis] fix composer.lock invalidation for deps=low (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 1045717e548d · 2018-08-24T14:41:20.000+02:00
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
diff --git a/.github/rm-invalid-lowest-lock-files.php b/.github/rm-invalid-lowest-lock-files.php
@@ -48,7 +48,6 @@ function getContentHash(array $composerJson)
 
 foreach ($dirs as $dir) {
     if (!file_exists($dir.'/composer.lock') || !$composerLock = @json_decode(file_get_contents($dir.'/composer.lock'), true)) {
-        echo "$dir/composer.lock not found or invalid.\n";
         @unlink($dir.'/composer.lock');
         continue;
     }
@@ -62,7 +61,8 @@ function getContentHash(array $composerJson)
         @unlink($dir.'/composer.lock');
         continue;
     }
-    $composerJsons[$composerJson['name']] = array($dir, $composerLock['packages'], getRelevantContent($composerJson));
+    $composerLock += array('packages' => array(), 'packages-dev' => array());
+    $composerJsons[$composerJson['name']] = array($dir, $composerLock['packages'] + $composerLock['packages-dev'], getRelevantContent($composerJson));
 }
 
 $referencedCommits = array();

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ function getContentHash(array $composerJson)`
`48`	`48`
`49`	`49`	`foreach ($dirs as $dir) {`
`50`	`50`	`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";`
`52`	`51`	`@unlink($dir.'/composer.lock');`
`53`	`52`	`continue;`
`54`	`53`	`}`
`@@ -62,7 +61,8 @@ function getContentHash(array $composerJson)`
`62`	`61`	`@unlink($dir.'/composer.lock');`
`63`	`62`	`continue;`
`64`	`63`	`}`
`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));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`$referencedCommits = array();`