Merge pull request #9077 from glaubinix/f/api-data-detection

Driver: only cache composer.json file without API data to disk

src/Composer/Repository/Vcs/BitbucketDriver.php

@@ -119,10 +119,14 @@ abstract class BitbucketDriver extends VcsDriver
 
         if (!isset($this->infoCache[$identifier])) {
             if ($this->shouldCache($identifier) && $res = $this->cache->read($identifier)) {
-                return $this->infoCache[$identifier] = JsonFile::parseJson($res);
+                $composer = JsonFile::parseJson($res);
-            }
+            } else {
+                $composer = $this->getBaseComposerInformation($identifier);
 
-            $composer = $this->getBaseComposerInformation($identifier);
+                if ($this->shouldCache($identifier)) {
+                    $this->cache->write($identifier, json_encode($composer));
+                }
+            }
 
             if ($composer) {
                 // specials for bitbucket
@@ -173,10 +177,6 @@ abstract class BitbucketDriver extends VcsDriver
             }
 
             $this->infoCache[$identifier] = $composer;
-
-            if ($this->shouldCache($identifier)) {
-                $this->cache->write($identifier, json_encode($composer));
-            }
         }
 
         return $this->infoCache[$identifier];

src/Composer/Repository/Vcs/GitHubDriver.php

@@ -150,10 +150,14 @@ class GitHubDriver extends VcsDriver
 
         if (!isset($this->infoCache[$identifier])) {
             if ($this->shouldCache($identifier) && $res = $this->cache->read($identifier)) {
-                return $this->infoCache[$identifier] = JsonFile::parseJson($res);
+                $composer =  JsonFile::parseJson($res);
-            }
+            } else {
+                $composer = $this->getBaseComposerInformation($identifier);
 
-            $composer = $this->getBaseComposerInformation($identifier);
+                if ($this->shouldCache($identifier)) {
+                    $this->cache->write($identifier, json_encode($composer));
+                }
+            }
 
             if ($composer) {
                 // specials for github
@@ -172,10 +176,6 @@ class GitHubDriver extends VcsDriver
                 }
             }
 
-            if ($this->shouldCache($identifier)) {
-                $this->cache->write($identifier, json_encode($composer));
-            }
-
             $this->infoCache[$identifier] = $composer;
         }
 

src/Composer/Repository/Vcs/GitLabDriver.php

@@ -130,10 +130,14 @@ class GitLabDriver extends VcsDriver
 
         if (!isset($this->infoCache[$identifier])) {
             if ($this->shouldCache($identifier) && $res = $this->cache->read($identifier)) {
-                return $this->infoCache[$identifier] = JsonFile::parseJson($res);
+                $composer =  JsonFile::parseJson($res);
-            }
+            } else {
+                $composer = $this->getBaseComposerInformation($identifier);
 
-            $composer = $this->getBaseComposerInformation($identifier);
+                if ($this->shouldCache($identifier)) {
+                    $this->cache->write($identifier, json_encode($composer));
+                }
+            }
 
             if ($composer) {
                 // specials for gitlab (this data is only available if authentication is provided)
@@ -145,10 +149,6 @@ class GitLabDriver extends VcsDriver
                 }
             }
 
-            if ($this->shouldCache($identifier)) {
-                $this->cache->write($identifier, json_encode($composer));
-            }
-
             $this->infoCache[$identifier] = $composer;
         }
 
@@ -446,7 +446,7 @@ class GitLabDriver extends VcsDriver
                     if (!$moreThanGuestAccess) {
                         $this->io->writeError('<warning>GitLab token with Guest only access detected</warning>');
 
-                        return $this->attemptCloneFallback(); 
+                        return $this->attemptCloneFallback();
                     }
                 }