Merge pull request #8534 from kenjis/fix-spark-not-work-in-prod

[4.5] fix: spark does not work with composer install --no-dev
codeigniter4 · Feb 14, 2024 · b41ac31 · b41ac31
2 parents 01e1a46 + 1cd4cd9
commit b41ac31
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/system/Commands/Generators/TestGenerator.php b/system/Commands/Generators/TestGenerator.php
@@ -81,6 +81,11 @@ public function run(array $params)
         $this->template  = 'test.tpl.php';
 
         $this->classNameLang = 'CLI.generator.className.test';
+
+        $autoload = Services::autoloader();
+        $autoload->addNamespace('CodeIgniter', TESTPATH . 'system');
+        $autoload->addNamespace('Tests', ROOTPATH . 'tests');
+
         $this->generateClass($params);
     }
 

diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
@@ -91,9 +91,8 @@ class AutoloadConfig
      * @var array<string, string>
      */
     protected $corePsr4 = [
-        'CodeIgniter' => [SYSTEMPATH, TESTPATH . 'system'],
+        'CodeIgniter' => SYSTEMPATH,
         'Config'      => APPPATH . 'Config',
-        'Tests'       => ROOTPATH . 'tests',
     ];
 
     /**

diff --git a/tests/system/Commands/Utilities/NamespacesTest.php b/tests/system/Commands/Utilities/NamespacesTest.php
@@ -58,9 +58,7 @@ public function testNamespacesCommandCodeIgniterOnly(): void
             | Namespace     | Path                    | Found? |
             +---------------+-------------------------+--------+
             | CodeIgniter   | ROOTPATH/system         | Yes    |
-            | CodeIgniter   | ROOTPATH/tests/system   | Yes    |
             | Config        | APPPATH/Config          | Yes    |
-            | Tests         | ROOTPATH/tests          | Yes    |
             | App           | ROOTPATH/app            | Yes    |
             | Tests\Support | ROOTPATH/tests/_support | Yes    |
             +---------------+-------------------------+--------+