Add support for the new composer installed.json format (#32310) (#32328)

GrahamCampbell · KubqoA · web-flow · commit fb968efe56a2 · 2020-04-11T09:41:54.000-05:00
Co-authored-by: Jakub Arbet &lt;jakub.arbet@protonmail.com&gt;
diff --git a/src/Illuminate/Foundation/PackageManifest.php b/src/Illuminate/Foundation/PackageManifest.php
@@ -113,7 +113,9 @@ public function build()
         $packages = [];
 
         if ($this->files->exists($path = $this->vendorPath.'/composer/installed.json')) {
-            $packages = json_decode($this->files->get($path), true);
+            $installed = json_decode($this->files->get($path), true);
+
+            $packages = $installed['packages'] ?? $installed;
         }
 
         $ignoreAll = in_array('*', $ignore = $this->packagesToIgnore());

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,9 @@ public function build()`
`113`	`113`	`$packages = [];`
`114`	`114`
`115`	`115`	`if ($this->files->exists($path = $this->vendorPath.'/composer/installed.json')) {`
`116`		`- $packages = json_decode($this->files->get($path), true);`
	`116`	`+ $installed = json_decode($this->files->get($path), true);`
	`117`	`+`
	`118`	`+ $packages = $installed['packages'] ?? $installed;`
`117`	`119`	`}`
`118`	`120`
`119`	`121`	`$ignoreAll = in_array('*', $ignore = $this->packagesToIgnore());`