Merge pull request #7218 from kenjis/update-kint-503

samsonasik · web-flow · commit 770351f8d01a · 2023-02-05T11:37:18.000+07:00
chore: update Kint to 5.0.3
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
@@ -13,7 +13,7 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
-        "kint-php/kint": "^5.0.1",
+        "kint-php/kint": "^5.0.3",
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
         "friendsofphp/php-cs-fixer": "3.13.0",
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
-        "kint-php/kint": "^5.0.1",
+        "kint-php/kint": "^5.0.3",
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
         "friendsofphp/php-cs-fixer": "3.13.0",
diff --git a/system/ThirdParty/Kint/Utils.php b/system/ThirdParty/Kint/Utils.php
@@ -118,7 +118,9 @@ public static function composerGetExtras(string $key = 'kint'): array
                     continue;
                 }
 
-                foreach ($packages as $package) {
+                // Composer 2.0 Compatibility: packages are now wrapped into a "packages" top level key instead of the whole file being the package array
+                // @see https://getcomposer.org/upgrade/UPGRADE-2.0.md
+                foreach ($packages['packages'] ?? $packages as $package) {
                     if (isset($package['extra'][$key]) && \is_array($package['extra'][$key])) {
                         $extras = \array_replace($extras, $package['extra'][$key]);
                     }

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,9 @@ public static function composerGetExtras(string $key = 'kint'): array`
`118`	`118`	`continue;`
`119`	`119`	`}`
`120`	`120`
`121`		`- foreach ($packages as $package) {`
	`121`	`+ // Composer 2.0 Compatibility: packages are now wrapped into a "packages" top level key instead of the whole file being the package array`
	`122`	`+ // @see https://getcomposer.org/upgrade/UPGRADE-2.0.md`
	`123`	`+ foreach ($packages['packages'] ?? $packages as $package) {`
`122`	`124`	`if (isset($package['extra'][$key]) && \is_array($package['extra'][$key])) {`
`123`	`125`	`$extras = \array_replace($extras, $package['extra'][$key]);`
`124`	`126`	`}`