Merge pull request zendframework/zendframework#1990 from weierophinne…

…y/hotfix/servicemanager-initializer

Allow passing initializer class names in configuration

src/AbstractPluginManager.php

@@ -10,8 +10,6 @@
 
 namespace Zend\ServiceManager;
 
-use ReflectionClass;
-
 /**
  * ServiceManager implementation for managing plugins
  *
@@ -188,28 +186,4 @@ protected function createFromInvokable($canonicalName, $requestedName)
 
         return $instance;
     }
-
-    /**
-     * Checks if the object has this class as one of its parents
-     *
-     * @see https://bugs.php.net/bug.php?id=53727
-     * @see https://github.com/zendframework/zf2/pull/1807
-     *
-     * @param string $className
-     * @param string $type
-     */
-    protected static function isSubclassOf($className, $type)
-    {
-        if (is_subclass_of($className, $type)) {
-            return true;
-        }
-        if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
-            return false;
-        }
-        if (!interface_exists($type)) {
-            return false;
-        }
-        $r = new ReflectionClass($className);
-        return $r->implementsInterface($type);
-    }
 }

src/ServiceManager.php

@@ -10,6 +10,8 @@
 
 namespace Zend\ServiceManager;
 
+use ReflectionClass;
+
 class ServiceManager implements ServiceLocatorInterface
 {
 
@@ -284,7 +286,12 @@ public function addAbstractFactory($factory, $topOfStack = true)
     public function addInitializer($initializer, $topOfStack = true)
     {
         if (!is_callable($initializer) && !$initializer instanceof InitializerInterface) {
-            throw new Exception\InvalidArgumentException('$initializer should be callable.');
+            if (!is_string($initializer) 
+                || !$this->isSubclassOf($initializer, __NAMESPACE__ . '\InitializerInterface')
+            ) {
+                throw new Exception\InvalidArgumentException('$initializer should be callable.');
+            }
+            $initializer = new $initializer;
         }
 
         if ($topOfStack) {
@@ -844,4 +851,28 @@ protected function createFromAbstractFactory($canonicalName, $requestedName)
 
         return $instance;
     }
+
+    /**
+     * Checks if the object has this class as one of its parents
+     *
+     * @see https://bugs.php.net/bug.php?id=53727
+     * @see https://github.com/zendframework/zf2/pull/1807
+     *
+     * @param string $className
+     * @param string $type
+     */
+    protected static function isSubclassOf($className, $type)
+    {
+        if (is_subclass_of($className, $type)) {
+            return true;
+        }
+        if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
+            return false;
+        }
+        if (!interface_exists($type)) {
+            return false;
+        }
+        $r = new ReflectionClass($className);
+        return $r->implementsInterface($type);
+    }
 }

test/ServiceManagerTest.php

@@ -509,4 +509,16 @@ public function testWillNotCreateCircularReferences()
         $foo = $sm->get('foo');
         $this->assertSame($abstractFactory->expectedInstance, $foo);
     }
+
+    public function testShouldAllowAddingInitializersAsClassNames()
+    {
+        $result = $this->serviceManager->addInitializer('ZendTest\ServiceManager\TestAsset\FooInitializer');
+        $this->assertSame($this->serviceManager, $result);
+    }
+
+    public function testShouldRaiseExceptionIfInitializerClassIsNotAnInitializerInterfaceImplementation()
+    {
+        $this->setExpectedException('Zend\ServiceManager\Exception\InvalidArgumentException');
+        $result = $this->serviceManager->addInitializer(get_class($this));
+    }
 }