Merge branch 'hotfix/zendframework/zendframework#6021-di-abstract-fac…

…tory-invalid-variable-name' Close zendframework/zendframework#6021
zendframework · Apr 3, 2014 · 25d94d4 · 25d94d4
2 parents 840ac1e + e9d1799
commit 25d94d4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Di/DiAbstractServiceFactory.php b/src/Di/DiAbstractServiceFactory.php
@@ -43,7 +43,7 @@ public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $
             return $this->get($requestedName, array());
         }
 
-        return $this->get($serviceName, array());
+        return $this->get($name, array());
     }
 
     /**

diff --git a/test/Di/DiAbstractServiceFactoryTest.php b/test/Di/DiAbstractServiceFactoryTest.php
@@ -55,6 +55,18 @@ public function testConstructor()
         $this->assertInstanceOf('Zend\ServiceManager\Di\DiAbstractServiceFactory', $instance);
     }
 
+    /**
+     * @group 6021
+     *
+     * @covers Zend\ServiceManager\Di\DiAbstractServiceFactory::createServiceWithName
+     * @covers Zend\ServiceManager\Di\DiAbstractServiceFactory::get
+     */
+    public function testCreateServiceWithNameAndWithoutRequestName()
+    {
+        $foo = $this->diAbstractServiceFactory->createServiceWithName($this->mockServiceLocator, 'foo', null);
+        $this->assertEquals($this->fooInstance, $foo);
+    }
+
     /**
      * @covers Zend\ServiceManager\Di\DiAbstractServiceFactory::createServiceWithName
      * @covers Zend\ServiceManager\Di\DiAbstractServiceFactory::get