fix fatal error when passing invalid class string as factory

filecage · Jun 1, 2023 · 9ee0bd9 · pleinx · Jun 1, 2023 · filecage
1 parent 0808cd1
commit 9ee0bd9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/InvokableFactory.php b/lib/InvokableFactory.php
@@ -13,7 +13,7 @@ class InvokableFactory extends Invokable {
         private $factoryCreatable;
 
         /**
-         * @param $factory
+         * @param class-string|string|callable|Factory $factory
          *
          * @return Invokable|InvokableFactory
          * @throws InvalidFactory
@@ -27,7 +27,7 @@ static function createFromAnyFactory ($factory) {
             } elseif (is_string($factory) && class_exists($factory)) {
                 $factoryCreatable = Creatable::createFromClassName($factory);
                 if (!$factoryCreatable->getReflectionClass()->implementsInterface(Factory::class)) {
-                    throw new InvalidFactory(get_class($factory));
+                    throw new InvalidFactory($factory, null, 'Factory does not implement ' . Factory::class . ' interface');
                 }
 
                 $invokable = new InvokableFactory($factoryCreatable);

diff --git a/tests/ExceptionsTest.php b/tests/ExceptionsTest.php
@@ -5,6 +5,7 @@
     use Creator\Exceptions\InvalidFactory;
     use Creator\Exceptions\Unresolvable;
     use Creator\Exceptions\UnresolvableDependency;
+    use Creator\Tests\Mocks\AnotherSimpleClass;
     use Creator\Tests\Mocks\ExtendedClass;
     use Creator\Tests\Mocks\InvalidClass;
     use Creator\Tests\Mocks\InvalidNestedRequirementClass;
@@ -71,6 +72,12 @@ function testShouldThrowInvalidFactoryExceptionWhenRegisteringNullToInjectedRegi
             $this->creator->createInjected(SimpleClass::class)->withFactory(null, SimpleClass::class);
         }
 
+        function testShouldThrowInvalidFactoryWhenRegisteringFactoryThatDoesNotImplementFactoryInterface () {
+            $this->expectException(InvalidFactory::class);
+            $this->expectExceptionMessage('Trying to register unsupported factory type `Creator\Tests\Mocks\AnotherSimpleClass` for class `Creator\Tests\Mocks\SimpleClass` (Factory does not implement Creator\Interfaces\Factory interface)');
+            $this->creator->createInjected(ExtendedClass::class)->withFactory(AnotherSimpleClass::class, SimpleClass::class);
+        }
+
         function testShouldThrowUnresolvableExceptionWhenUsingUnionTypes () {
             if (version_compare(PHP_VERSION, '8.0.0', '<')) {
                 $this->markTestSkipped('Union Types are only relevant for PHP versions >= 8.0.0');