Improved tests aliases with abstract factories.

There was an error in the testcase `testAbstractFactoryShouldBeCheckedForResolvedAliasesInsteadOfAliasName`
where the returnValueMap of phpunit was used wrong. This caused a false positive. The test was returning an
array which is interpreted as `TRUE`.

I discovered this when I added the `testResolvedAliasFromAbstractFactory`, which should do the opposite form the
earlier mentioned testcase.

Beside that I found a way that the servicemanager was returning `null` instead of returning false when the last fallback
on abstract factories failed.

Author: jaapio

src/ServiceManager.php

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

test/ServiceManagerTest.php

@@ -285,18 +285,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 +312,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($this->any())
+            ->method('canCreate')
+            ->withConsecutive(
+                [ $this->anything(), $this->equalTo('Alias') ],
+                [ $this->anything(), $this->equalTo('ServiceName')]
+            )
+            ->will(self::returnCallback(
+                function ($context, $name) {
+                    return $name === 'ServiceName';
+                }
+            ));
+        $this->assertTrue($serviceManager->has('Alias'));
+    }
+
+    public function testResolvedAliasNoMatchingAbstractFactoryReturnsFalse()
+    {
+        $abstractFactory = $this->createMock(AbstractFactoryInterface::class);
+
+        $serviceManager = new SimpleServiceManager([
+            'aliases' => [
+                'Alias' => 'ServiceName',
+            ],
+            'abstract_factories' => [
+                $abstractFactory,
+            ],
+        ]);
+
+        $abstractFactory
+            ->expects($this->any())
+            ->method('canCreate')
+            ->withConsecutive(
+                [ $this->anything(), $this->equalTo('Alias') ],
+                [ $this->anything(), $this->equalTo('ServiceName')]
+            )
+            ->willReturn(false);
+        $this->assertFalse($serviceManager->has('Alias'));
+    }
 }