refactor: Fix phpstan codeigniter.configArgumentInstanceof

codeigniter4 · Jan 9, 2025 · 539a76c · 539a76c
1 parent 42a00ff
commit 539a76c
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 28 deletions.
diff --git a/system/Config/Services.php b/system/Config/Services.php
@@ -619,7 +619,7 @@ public static function routes(bool $getShared = true)
             return static::getSharedInstance('routes');
         }
 
-        return new RouteCollection(AppServices::get('locator'), config(Modules::class), config(Routing::class));
+        return new RouteCollection(AppServices::get('locator'), new Modules(), config(Routing::class));
     }
 
     /**

diff --git a/system/Events/Events.php b/system/Events/Events.php
@@ -76,7 +76,7 @@ public static function initialize()
             return;
         }
 
-        $config = config(Modules::class);
+        $config = new Modules();
         $events = APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php';
         $files  = [];
 

diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
@@ -116,7 +116,7 @@ public function __construct($config, RequestInterface $request, ResponseInterfac
         $this->request = &$request;
         $this->setResponse($response);
 
-        $this->modules = $modules ?? config(Modules::class);
+        $this->modules = $modules instanceof Modules ? $modules : new Modules();
 
         if ($this->modules->shouldDiscover('filters')) {
             $this->discoverFilters();

diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
@@ -54,7 +54,7 @@ public function testInitialize(): void
         /**
          * @var Modules $config
          */
-        $config          = config('Modules');
+        $config          = new Modules();
         $config->aliases = [];
 
         // it should start out empty

diff --git a/utils/phpstan-baseline/codeigniter.configArgumentInstanceof.neon b/utils/phpstan-baseline/codeigniter.configArgumentInstanceof.neon
diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
@@ -3,7 +3,6 @@ includes:
     - assign.propertyType.neon
     - booleanAnd.rightAlwaysTrue.neon
     - codeigniter.cacheHandlerInstance.neon
-    - codeigniter.configArgumentInstanceof.neon
     - codeigniter.frameworkExceptionInstance.neon
     - codeigniter.getReassignArray.neon
     - codeigniter.modelArgumentInstanceof.neon
-Original file line number
+Diff line change
@@ Expand Up / @@ -619,7 +619,7 @@ public static function routes(bool $getShared = true) @@
                 return static::getSharedInstance('routes');
             }
-            return new RouteCollection(AppServices::get('locator'), config(Modules::class), config(Routing::class));
+            return new RouteCollection(AppServices::get('locator'), new Modules(), config(Routing::class));
         }
         /**
@@ Expand Down @@