Merge #391 Survive through a malformed installed.json file

kint-php · Jul 30, 2022 · 84a61c9 · 84a61c9
2 parents 055630e + 78ce27b
commit 84a61c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/build/kint.phar b/build/kint.phar
diff --git a/src/Utils.php b/src/Utils.php
@@ -109,6 +109,10 @@ public static function composerGetExtras($key = 'kint')
             if (\file_exists($installed) && \is_readable($installed)) {
                 $packages = \json_decode(\file_get_contents($installed), true);
 
+                if (!\is_array($packages)) {
+                    continue;
+                }
+
                 foreach ($packages as $package) {
                     if (isset($package['extra'][$key]) && \is_array($package['extra'][$key])) {
                         $extras = \array_replace($extras, $package['extra'][$key]);

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
@@ -259,6 +259,9 @@ public function testComposerGetExtras()
         ]));
 
         $this->assertSame(['more' => 'test', 'data', 'test' => 'ing'], Utils::composerGetExtras('kint'));
+
+        \file_put_contents($this->composer_test_dir.'/composer/installed.json', 'malformed JSON.');
+        $this->assertSame([], Utils::composerGetExtras('kint'));
     }
 
     public function traceProvider()