Merge f68fea3 into 615fc00

zendframework · Jan 10, 2019 · a7de3d4 · a7de3d4
2 parents 615fc00 + f68fea3
commit a7de3d4
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 0 deletions.
diff --git a/test/Resolver/DependencyResolverTest.php b/test/Resolver/DependencyResolverTest.php
@@ -640,4 +640,39 @@ public function testParametresResolverShouldNotCheckTheTypeForString()
         $this->assertInstanceOf(TypeInjection::class, $parameters['a']);
         $this->assertSame('my-service', $parameters['a']->__toString());
     }
+
+    /**
+     * Ensures the documented preference resolver behavior as documented
+     *
+     * @see https://docs.zendframework.com/zend-di/config/#type-preferences
+     */
+    public function testResolvePreferenceFallsBackToGlobalPreferenceWhenNotSuitableForRequirement()
+    {
+        $definition = new RuntimeDefinition();
+        $config = new Config();
+        $config->setTypePreference(TestAsset\A::class, TestAsset\B::class, TestAsset\RequiresA::class);
+        $config->setTypePreference(TestAsset\A::class, TestAsset\ExtendedA::class);
+        $resolver = new DependencyResolver($definition, $config);
+
+        $this->assertSame(
+            TestAsset\ExtendedA::class,
+            $resolver->resolvePreference(TestAsset\A::class, TestAsset\RequiresA::class)
+        );
+    }
+
+    /**
+     * Ensures the documented preference resolver behavior as documented
+     *
+     * @see https://docs.zendframework.com/zend-di/config/#type-preferences
+     */
+    public function testResolvePreferenceReturnsNullWhenNothingIsSuitableForRequirement()
+    {
+        $definition = new RuntimeDefinition();
+        $config = new Config();
+        $config->setTypePreference(TestAsset\A::class, TestAsset\ExtendedB::class, TestAsset\RequiresA::class);
+        $config->setTypePreference(TestAsset\A::class, TestAsset\B::class);
+        $resolver = new DependencyResolver($definition, $config);
+
+        $this->assertNull($resolver->resolvePreference(TestAsset\A::class, TestAsset\RequiresA::class));
+    }
 }
diff --git a/test/TestAsset/ExtendedA.php b/test/TestAsset/ExtendedA.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-di for the canonical source repository
+ * @copyright Copyright (c) 2019 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-di/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Di\TestAsset;
+
+class ExtendedA extends A
+{
+}