Fixed bug in abstract factory mock in

testAbstractFactoryShouldBeCheckedForResolvedAliasesInsteadOfAliasName.

Added check of resolved aliases against abstract factories.

Author: fhein

src/ServiceManager.php

@@ -267,7 +267,16 @@ public function has($name)
 
         // Finally check aliases
         $resolvedName = $this->aliases[$name];
-        return isset($this->services[$resolvedName]) || isset($this->factories[$resolvedName]);
+        if (isset($this->services[$resolvedName]) || isset($this->factories[$resolvedName])) {
+            return true;
+        }
+
+        // Check abstract factories on $resolvedName also
+        foreach ($this->abstractFactories as $abstractFactory) {
+            if ($abstractFactory->canCreate($this->creationContext, $resolvedName)) {
+                return true;
+            }
+        }
     }
 
     /**

test/ServiceManagerTest.php

@@ -272,7 +272,7 @@ public function testSetAliasShouldWorkWithRecursiveAlias()
         self::assertSame($service, $headAlias);
     }
 
-    public function testAbstractFactoryShouldBeCheckedForResolvedAliasesInsteadOfAliasNameName()
+    public function testAbstractFactoryShouldBeCheckedForResolvedAliasesInsteadOfAliasName()
     {
         $abstractFactory = $this->createMock(AbstractFactoryInterface::class);
 
@@ -288,8 +288,8 @@ public function testAbstractFactoryShouldBeCheckedForResolvedAliasesInsteadOfAli
         $abstractFactory
             ->expects(self::once())
             ->method('canCreate')
-            ->with(self::anything(), 'ServiceName')
-            ->willReturn(true);
+            ->with($this->anything())
+            ->willReturn($this->equalTo('ServiceName'));
 
         $this->assertTrue($serviceManager->has('Alias'));
     }