Merge remote-tracking branch 'upstream/develop' into 4.4

codeigniter4 · Jul 25, 2023 · c599769 · c599769
2 parents fbcecb3 + 5c51240
commit c599769
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.17.6",
+        "rector/rector": "0.17.7",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {
@@ -77,6 +77,7 @@
             "bash -c \"if [ -f admin/setup.sh ]; then bash admin/setup.sh; fi\""
         ],
         "analyze": [
+            "Composer\\Config::disableProcessTimeout",
             "bash -c \"XDEBUG_MODE=off phpstan analyse\"",
             "rector process --dry-run"
         ],

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -365,7 +365,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
                 return;
             }
 
-            $toolbar = Services::toolbar(config(self::class));
+            $toolbar = Services::toolbar(config(ToolbarConfig::class));
             $stats   = $app->getPerformanceStats();
             $data    = $toolbar->run(
                 $stats['startTime'],