Merge pull request #9 from filecage/#8-interface-factory-caching

#8 fixes interface factory caching
filecage · Aug 13, 2018 · bd65995 · bd65995
2 parents dfaab07 + e26a5fa
commit bd65995
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/lib/Creation.php b/lib/Creation.php
@@ -58,7 +58,7 @@ function create () {
          */
         private function createInstanceWithRegistry (string $className, Creatable $creatable, ResourceRegistry $registry) {
             // Does the registry already contain the resource?
-            $instance = $registry->getClassResource($className);
+            $instance = $registry->getClassResource($className) ?? $registry->findFulfillingInstance($creatable);
             if ($instance !== null) {
                 return $instance;
             }

diff --git a/tests/Mocks/ArbitraryClassOnlyResolvableByFactory.php b/tests/Mocks/ArbitraryClassOnlyResolvableByFactory.php
@@ -2,7 +2,7 @@
 
     namespace Creator\Tests\Mocks;
 
-    class ArbitraryClassOnlyResolvableByFactory {
+    class ArbitraryClassOnlyResolvableByFactory implements ArbitraryInterface {
 
         /**
          * @var SimpleClass

diff --git a/tests/Mocks/ArbitraryInterface.php b/tests/Mocks/ArbitraryInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+    namespace Creator\Tests\Mocks;
+
+    interface ArbitraryInterface {
+
+    }
diff --git a/tests/ResourceCachingTest.php b/tests/ResourceCachingTest.php
@@ -3,6 +3,9 @@
     namespace Creator\Tests;
 
     use Creator\Creator;
+    use Creator\Tests\Mocks\ArbitraryClassOnlyResolvableByFactory;
+    use Creator\Tests\Mocks\ArbitraryFactory;
+    use Creator\Tests\Mocks\ArbitraryInterface;
     use Creator\Tests\Mocks\ExtendedClass;
     use Creator\Tests\Mocks\MoreExtendedClass;
     use Creator\Tests\Mocks\SimpleClass;
@@ -57,4 +60,18 @@ function testExpectsInnerDependencyCachingWhenForcingInstance () {
             $this->assertSame($a->getAnotherSimpleClass(), $b->getAnotherSimpleClass());
         }
 
+        function testExpectsInterfaceFactoryResultCaching () {
+            $creator = new Creator();
+
+            $creator->registerFactory(function() {
+                return new ArbitraryClassOnlyResolvableByFactory(new SimpleClass(), ArbitraryFactory::PRIMITIVE_VALUE);
+            }, ArbitraryInterface::class);
+
+            $firstArbitraryImplementation = $creator->create(ArbitraryInterface::class);
+            $secondArbitraryImplementation = $creator->create(ArbitraryInterface::class);
+
+            $this->assertInstanceOf(ArbitraryInterface::class, $firstArbitraryImplementation);
+            $this->assertSame($firstArbitraryImplementation, $secondArbitraryImplementation);
+        }
+
     }