Fix #102: Reference should not fallback to container (#104)

yiisoft · Jul 28, 2021 · 6d03850 · 6d03850
1 parent 87a17cf
commit 6d03850
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/src/DependencyResolver.php b/src/DependencyResolver.php
@@ -81,10 +81,7 @@ public function has($id): bool
      */
     public function resolve(string $id)
     {
-        if (isset($this->definitions[$id])) {
-            return $this->getFromFactory($id);
-        }
-        return $this->get($id);
+        return $this->getFromFactory($id);
     }
 
     public function shouldCloneOnResolve(): bool

diff --git a/tests/Unit/Definition/DynamicReferenceTest.php b/tests/Unit/Definition/DynamicReferenceTest.php
@@ -10,6 +10,7 @@
 use Yiisoft\Factory\DependencyResolver;
 use Yiisoft\Factory\Tests\Support\EngineInterface;
 use Yiisoft\Factory\Tests\Support\EngineMarkOne;
+use Yiisoft\Factory\Tests\Support\EngineMarkTwo;
 use Yiisoft\Factory\Tests\TestHelper;
 use Yiisoft\Injector\Injector;
 use Yiisoft\Test\Support\Container\SimpleContainer;
@@ -24,13 +25,17 @@ public function createDependencyResolver(): DependencyResolver
             Injector::class => &$injector,
         ]);
         $injector = new Injector($container);
-        return TestHelper::createDependencyResolver($container);
+
+        $dependencyResolver = TestHelper::createDependencyResolver($container);
+        $dependencyResolver->setFactoryDefinition(EngineInterface::class, EngineMarkTwo::class);
+
+        return $dependencyResolver;
     }
 
     public function testString(): void
     {
         $ref = DynamicReference::to(EngineInterface::class);
-        $this->assertInstanceOf(EngineMarkOne::class, $ref->resolve($this->createDependencyResolver()));
+        $this->assertInstanceOf(EngineMarkTwo::class, $ref->resolve($this->createDependencyResolver()));
     }
 
     public function testClosure(): void

diff --git a/tests/Unit/FactoryTest.php b/tests/Unit/FactoryTest.php
@@ -302,6 +302,22 @@ public function testDoNotFallbackToContainer(): void
         $this->assertNotSame($engine, $instance);
     }
 
+    public function testDoNotFallbackToContainerForReference(): void
+    {
+        $factory = new Factory(
+            new SimpleContainer([
+                EngineInterface::class => new EngineMarkOne(),
+            ]),
+            [
+                EngineInterface::class => new EngineMarkTwo(),
+                'engine' => Reference::to(EngineInterface::class),
+            ]
+        );
+
+        $engine = $factory->create('engine');
+        $this->assertInstanceOf(EngineMarkTwo::class, $engine);
+    }
+
     /**
      * When resolving dependencies, factory should rely on container only
      */