Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 817e7cdfaace · 2018-08-19T14:57:58.000+02:00
* 2.8:
  [travis] fix composer.lock invalidation for PRs patching several components
diff --git a/.github/rm-invalid-lowest-lock-files.php b/.github/rm-invalid-lowest-lock-files.php
@@ -79,7 +79,13 @@ function getContentHash(array $composerJson)
             continue 2;
         }
 
-        foreach (array('minimum-stability', 'prefer-stable', 'repositories') as $key) {
+        if (isset($composerJsons[$name][2]['repositories']) && !isset($lockedJson[$key]['repositories'])) {
+            // the locked package has been patched locally but the lock references a commit,
+            // which means the referencing package itself is not modified
+            continue;
+        }
+
+        foreach (array('minimum-stability', 'prefer-stable') as $key) {
             if (array_key_exists($key, $composerJsons[$name][2])) {
                 $lockedJson[$key] = $composerJsons[$name][2][$key];
             }
@@ -92,7 +98,9 @@ function getContentHash(array $composerJson)
             continue 2;
         }
 
-        $referencedCommits[$name][$lockedJson['source']['reference']][] = $dir;
+        if ($lockedJson['dist']['reference']) {
+            $referencedCommits[$name][$lockedJson['dist']['reference']][] = $dir;
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,13 @@ function getContentHash(array $composerJson)`
`79`	`79`	`continue 2;`
`80`	`80`	`}`
`81`	`81`
`82`		`- foreach (array('minimum-stability', 'prefer-stable', 'repositories') as $key) {`
	`82`	`+ if (isset($composerJsons[$name][2]['repositories']) && !isset($lockedJson[$key]['repositories'])) {`
	`83`	`+ // the locked package has been patched locally but the lock references a commit,`
	`84`	`+ // which means the referencing package itself is not modified`
	`85`	`+ continue;`
	`86`	`+ }`
	`87`	`+`
	`88`	`+ foreach (array('minimum-stability', 'prefer-stable') as $key) {`
`83`	`89`	`if (array_key_exists($key, $composerJsons[$name][2])) {`
`84`	`90`	`$lockedJson[$key] = $composerJsons[$name][2][$key];`
`85`	`91`	`}`
`@@ -92,7 +98,9 @@ function getContentHash(array $composerJson)`
`92`	`98`	`continue 2;`
`93`	`99`	`}`
`94`	`100`
`95`		`- $referencedCommits[$name][$lockedJson['source']['reference']][] = $dir;`
	`101`	`+ if ($lockedJson['dist']['reference']) {`
	`102`	`+ $referencedCommits[$name][$lockedJson['dist']['reference']][] = $dir;`
	`103`	`+ }`
`96`	`104`	`}`
`97`	`105`	`}`
`98`	`106`