minor #40557 [travis] use packagist API v2 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 3d1c59ae7fd1 · 2021-03-23T20:33:33.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [travis] use packagist API v2 | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- af43ca0 [travis] use packagist API v2
diff --git a/.github/rm-invalid-lowest-lock-files.php b/.github/rm-invalid-lowest-lock-files.php
@@ -67,7 +67,7 @@ function getContentHash(array $composerJson)
 
 $referencedCommits = [];
 
-foreach ($composerJsons as list($dir, $lockedPackages)) {
+foreach ($composerJsons as [$dir, $lockedPackages]) {
     foreach ($lockedPackages as $lockedJson) {
         if (0 !== strpos($version = $lockedJson['version'], 'dev-') && '-dev' !== substr($version, -4)) {
             continue;
@@ -119,30 +119,36 @@ function getContentHash(array $composerJson)
 $chs = [];
 
 foreach ($referencedCommits as $name => $dirsByCommit) {
-    $chs[] = $ch = [curl_init(), fopen($_SERVER['HOME'].'/.cache/composer/repo/https---repo.packagist.org/provider-'.strtr($name, '/', '$').'.json', 'wb')];
-    curl_setopt($ch[0], CURLOPT_URL, 'https://repo.packagist.org/p/'.$name.'.json');
-    curl_setopt($ch[0], CURLOPT_FILE, $ch[1]);
-    curl_setopt($ch[0], CURLOPT_SHARE, $sh);
-    curl_multi_add_handle($mh, $ch[0]);
+    foreach (['', '~dev'] as $suffix) {
+        $chs[] = $ch = [curl_init(), fopen($_SERVER['HOME'].'/.cache/composer/repo/https---repo.packagist.org/provider-'.strtr($name, '/', '~').$suffix.'.json', 'w')];
+        curl_setopt($ch[0], CURLOPT_URL, 'https://repo.packagist.org/p2/'.$name.$suffix.'.json');
+        curl_setopt($ch[0], CURLOPT_FILE, $ch[1]);
+        curl_setopt($ch[0], CURLOPT_SHARE, $sh);
+        curl_multi_add_handle($mh, $ch[0]);
+    }
 }
 
 do {
     curl_multi_exec($mh, $active);
     curl_multi_select($mh);
 } while ($active);
 
-foreach ($chs as list($ch, $fd)) {
+foreach ($chs as [$ch, $fd]) {
     curl_multi_remove_handle($mh, $ch);
     curl_close($ch);
     fclose($fd);
 }
 
 foreach ($referencedCommits as $name => $dirsByCommit) {
-    $repo = file_get_contents($_SERVER['HOME'].'/.cache/composer/repo/https---repo.packagist.org/provider-'.strtr($name, '/', '$').'.json');
-    $repo = json_decode($repo, true);
+    foreach (['', '~dev'] as $suffix) {
+        $repo = file_get_contents($_SERVER['HOME'].'/.cache/composer/repo/https---repo.packagist.org/provider-'.strtr($name, '/', '~').$suffix.'.json');
+        $repo = json_decode($repo, true);
 
-    foreach ($repo['packages'][$name] as $version) {
-        unset($referencedCommits[$name][$version['source']['reference']]);
+        foreach ($repo['packages'][$name] as $version) {
+            if (isset($version['source']['reference'])) {
+                unset($referencedCommits[$name][$version['source']['reference']]);
+            }
+        }
     }
 }
 
