Merge branch 'fix/#241-improved-alias-tests' into develop

Close #241

Author: Ocramius

src/ServiceManager.php

@@ -278,6 +278,8 @@ public function has($name)
                 return true;
             }
         }
+
+        return false;
     }
 
     /**

test/ServiceManagerTest.php

@@ -8,12 +8,9 @@
 namespace ZendTest\ServiceManager;
 
 use DateTime;
-use Interop\Container\Exception\ContainerException;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use stdClass;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\ServiceManager\Factory\AbstractFactoryInterface;
 use Zend\ServiceManager\Factory\FactoryInterface;
 use Zend\ServiceManager\Factory\InvokableFactory;
@@ -285,18 +282,15 @@ public function testAbstractFactoryShouldBeCheckedForResolvedAliasesInsteadOfAli
             ],
         ]);
 
-        $valueMap = [
-            ['Alias', false],
-            ['ServiceName', true],
-        ];
-
         $abstractFactory
             ->method('canCreate')
             ->withConsecutive(
                 [ $this->anything(), $this->equalTo('Alias') ],
                 [ $this->anything(), $this->equalTo('ServiceName')]
             )
-            ->willReturn($this->returnValueMap($valueMap));
+            ->willReturnCallback(function ($context, $name) {
+                return $name === 'Alias';
+            });
         $this->assertTrue($serviceManager->has('Alias'));
     }
 
@@ -315,4 +309,56 @@ public function testFactoryMayBeStaticMethodDescribedByCallableString()
         $serviceManager = new SimpleServiceManager($config);
         $this->assertEquals(stdClass::class, get_class($serviceManager->get(stdClass::class)));
     }
+
+    public function testResolvedAliasFromAbstractFactory()
+    {
+        $abstractFactory = $this->createMock(AbstractFactoryInterface::class);
+
+        $serviceManager = new SimpleServiceManager([
+            'aliases'            => [
+                'Alias' => 'ServiceName',
+            ],
+            'abstract_factories' => [
+                $abstractFactory,
+            ],
+        ]);
+
+        $abstractFactory
+            ->expects(self::any())
+            ->method('canCreate')
+            ->withConsecutive(
+                [self::anything(), 'Alias'],
+                [self::anything(), 'ServiceName']
+            )
+            ->will(self::returnCallback(function ($context, $name) {
+                return $name === 'ServiceName';
+            }));
+
+        self::assertTrue($serviceManager->has('Alias'));
+    }
+
+    public function testResolvedAliasNoMatchingAbstractFactoryReturnsFalse()
+    {
+        $abstractFactory = $this->createMock(AbstractFactoryInterface::class);
+
+        $serviceManager = new SimpleServiceManager([
+            'aliases'            => [
+                'Alias' => 'ServiceName',
+            ],
+            'abstract_factories' => [
+                $abstractFactory,
+            ],
+        ]);
+
+        $abstractFactory
+            ->expects(self::any())
+            ->method('canCreate')
+            ->withConsecutive(
+                [self::anything(), 'Alias'],
+                [self::anything(), 'ServiceName']
+            )
+            ->willReturn(false);
+
+        self::assertFalse($serviceManager->has('Alias'));
+    }
 }