Merge pull request #8744 from kenjis/fix-Factories-cannot-get-defined…

…-class fix: Factories::get() cannot get defined classes
codeigniter4 · Apr 11, 2024 · 48be4ac · 48be4ac
2 parents e14e145 + ca66cb7
commit 48be4ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
@@ -180,7 +180,9 @@ public static function get(string $component, string $alias): ?object
         if (isset(self::$aliases[$component][$alias])) {
             $class = self::$aliases[$component][$alias];
 
-            return self::$instances[$component][$class];
+            if (isset(self::$instances[$component][$class])) {
+                return self::$instances[$component][$class];
+            }
         }
 
         return self::__callStatic($component, [$alias]);

diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
@@ -411,6 +411,19 @@ public function testDefineAndLoad(): void
         $this->assertInstanceOf(EntityModel::class, $model);
     }
 
+    public function testDefineAndGet(): void
+    {
+        Factories::define(
+            'models',
+            UserModel::class,
+            EntityModel::class
+        );
+
+        $model = Factories::get('models', UserModel::class);
+
+        $this->assertInstanceOf(EntityModel::class, $model);
+    }
+
     public function testGetComponentInstances()
     {
         Factories::config('App');