Fix Modules does not extend BaseConfig

codeigniter4 · Oct 21, 2023 · bcfbe29 · bcfbe29
1 parent 11772d4
commit bcfbe29
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -871,16 +871,6 @@
 	'count' => 4,
 	'path' => __DIR__ . '/system/Config/BaseConfig.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Argument \\#1 \\$name \\(\'Config\\\\\\\\Modules\'\\) passed to function config does not extend CodeIgniter\\\\\\\\Config\\\\\\\\BaseConfig\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Config/BaseConfig.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Argument \\#1 \\$name \\(\'Config\\\\\\\\Modules\'\\) passed to function config does not extend CodeIgniter\\\\\\\\Config\\\\\\\\BaseConfig\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Config/BaseService.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 3,

diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
@@ -82,7 +82,7 @@ public static function __set_state(array $array)
      */
     public function __construct()
     {
-        static::$moduleConfig = config(Modules::class);
+        static::$moduleConfig = new Modules();
 
         if (! static::$override) {
             return;

diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
@@ -330,9 +330,7 @@ public static function injectMock(string $name, $mock)
     protected static function discoverServices(string $name, array $arguments)
     {
         if (! static::$discovered) {
-            $config = config(Modules::class);
-
-            if ($config->shouldDiscover('services')) {
+            if ((new Modules())->shouldDiscover('services')) {
                 $locator = static::locator();
                 $files   = $locator->search('Config/Services');
 
@@ -372,9 +370,7 @@ protected static function discoverServices(string $name, array $arguments)
     protected static function buildServicesCache(): void
     {
         if (! static::$discovered) {
-            $config = config(Modules::class);
-
-            if ($config->shouldDiscover('services')) {
+            if ((new Modules())->shouldDiscover('services')) {
                 $locator = static::locator();
                 $files   = $locator->search('Config/Services');
 

diff --git a/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php b/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php
@@ -58,7 +58,6 @@ public function testSave()
 
         $this->assertArrayHasKey('aliases', $cachedData);
         $this->assertArrayHasKey('instances', $cachedData);
-        $this->assertArrayHasKey(Modules::class, $cachedData['aliases']);
         $this->assertArrayHasKey('App', $cachedData['aliases']);
     }