Merge branch 'hotfix/container-vs-sl'

Helps with zendframework/zend-mvc#149

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.0.1 - TBD
+## 1.0.1 - 2016-06-09
 
 ### Added
 
@@ -14,7 +14,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- Imports a patch from [zend-mvc](https://github.com/zendframework/zend-mvc/pull/149)
+  that fixes some issues with the `DiAbstractServiceFactoryFactory` due to
+  incorrect variable names and import statements.
 
 ### Fixed
 

src/DiAbstractServiceFactoryFactory.php

@@ -8,7 +8,6 @@
 namespace Zend\ServiceManager\Di;
 
 use Interop\Container\ContainerInterface;
-use DiAbstractServiceFactory;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\ServiceManager\ServiceManager;
@@ -27,8 +26,8 @@ public function __invoke(ContainerInterface $container, $name, array $options =
     {
         $factory = new DiAbstractServiceFactory($container->get('Di'), DiAbstractServiceFactory::USE_SL_BEFORE_DI);
 
-        if ($serviceLocator instanceof ServiceManager) {
-            $serviceLocator->addAbstractFactory($factory, false);
+        if ($container instanceof ServiceManager) {
+            $container->addAbstractFactory($factory, false);
         }
 
         return $factory;

test/DiAbstractServiceFactoryFactoryTest.php

@@ -0,0 +1,38 @@
+<?php
+namespace ZendTest\Mvc\Service;
+
+use Zend\ServiceManager\Di\DiAbstractServiceFactoryFactory;
+use Zend\ServiceManager\Di\DiFactory;
+use Zend\ServiceManager\Di\DiAbstractServiceFactory;
+use Zend\ServiceManager\ServiceManager;
+
+class DiAbstractServiceFactoryFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testWillInitializeDiAbstractServiceFactory()
+    {
+        $serviceManager = new ServiceManager();
+        $serviceManager->setService('config', ['di' => ['']]);
+        $serviceManager->setFactory('Di', new DiFactory());
+        $serviceManager->setFactory(DiAbstractServiceFactoryFactory::class, new DiAbstractServiceFactoryFactory());
+
+        $factory = $serviceManager->get(DiAbstractServiceFactoryFactory::class);
+        $this->assertInstanceOf(DiAbstractServiceFactory::class, $factory);
+    }
+
+    public function testDiAbstractServiceFactoryIsAddedToAbstractFactoriesOfServiceManager()
+    {
+        $serviceManager = $this->getMockBuilder(ServiceManager::class)
+            ->setMethods(['addAbstractFactory'])
+            ->getMock();
+
+        $serviceManager->expects($this->once())->method('addAbstractFactory')->with($this->callback(function ($param) {
+            return $param instanceof DiAbstractServiceFactory;
+        }));
+
+        $serviceManager->setService('config', ['di' => ['']]);
+        $serviceManager->setFactory('Di', new DiFactory());
+        $serviceManager->setFactory(DiAbstractServiceFactoryFactory::class, new DiAbstractServiceFactoryFactory());
+
+        $serviceManager->get(DiAbstractServiceFactoryFactory::class);
+    }
+}