From fb968efe56a2565191e0bfc130ecd373e0d745c1 Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Sat, 11 Apr 2020 15:41:54 +0100
Subject: [PATCH] Add support for the new composer installed.json format
 (#32310) (#32328)

Co-authored-by: Jakub Arbet <jakub.arbet@protonmail.com>
---
 src/Illuminate/Foundation/PackageManifest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Illuminate/Foundation/PackageManifest.php b/src/Illuminate/Foundation/PackageManifest.php
index a091372a0ad2..35079fdd6e42 100644
--- 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());