[travis] fix composer.lock invalidation for deps=low

nicolas-grekas · nicolas-grekas · commit 1df67632a4f5 · 2018-08-24T14:02:08.000+02:00
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;
     }
@@ -104,7 +103,9 @@ function getContentHash(array $composerJson)
     }
 }
 
-if (!$referencedCommits || (isset($_SERVER['TRAVIS_PULL_REQUEST']) && 'false' !== $_SERVER['TRAVIS_PULL_REQUEST'])) {
+print_r($referencedCommits);
+
+if (!$referencedCommits /*|| (isset($_SERVER['TRAVIS_PULL_REQUEST']) && 'false' !== $_SERVER['TRAVIS_PULL_REQUEST'])*/) {
     // cached commits cannot be stale for PRs
     return;
 }

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`	`}`
`@@ -104,7 +103,9 @@ function getContentHash(array $composerJson)`
`104`	`103`	`}`
`105`	`104`	`}`
`106`	`105`
`107`		`-if (!$referencedCommits \|\| (isset($_SERVER['TRAVIS_PULL_REQUEST']) && 'false' !== $_SERVER['TRAVIS_PULL_REQUEST'])) {`
	`106`	`+print_r($referencedCommits);`
	`107`	`+`
	`108`	`+if (!$referencedCommits /\|\| (isset($_SERVER['TRAVIS_PULL_REQUEST']) && 'false' !== $_SERVER['TRAVIS_PULL_REQUEST'])/) {`
`108`	`109`	`// cached commits cannot be stale for PRs`
`109`	`110`	`return;`
`110`	`111`	`}`