Fix delegators property

HolgerW1 · May 13, 2014 · 4365fb2 · 4365fb2
1 parent aa6f1d3
commit 4365fb2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/library/Zend/Mvc/Service/ServiceManagerConfig.php b/library/Zend/Mvc/Service/ServiceManagerConfig.php
@@ -65,6 +65,14 @@ class ServiceManagerConfig implements ConfigInterface
         'EventManager' => false,
     );
 
+    /**
+     *
+     * Delegators
+     *
+     * @var array
+     */
+    protected $delegators = array();
+
     /**
      * Constructor
      *
@@ -94,6 +102,9 @@ public function __construct(array $configuration = array())
             $this->shared = array_merge($this->shared, $configuration['shared']);
         }
 
+        if (isset($configuration['delegators'])) {
+            $this->delegators = array_merge($this->delegators, $configuration['delegators']);
+        }
     }
 
     /**
@@ -129,6 +140,10 @@ public function configureServiceManager(ServiceManager $serviceManager)
             $serviceManager->setShared($name, $value);
         }
 
+        foreach ($this->delegators as $name => $value) {
+            $serviceManager->addDelegator($name, $value);
+        }
+
         $serviceManager->addInitializer(function ($instance) use ($serviceManager) {
             if ($instance instanceof EventManagerAwareInterface) {
                 if ($instance->getEventManager() instanceof EventManagerInterface) {

diff --git a/tests/ZendTest/Mvc/Service/ServiceManagerConfigTest.php b/tests/ZendTest/Mvc/Service/ServiceManagerConfigTest.php
@@ -64,7 +64,7 @@ public function testCanAddDelegators()
         $config->configureServiceManager($sm);
 
         $std = $sm->get('foo');
-        $this->assertInstanceOf('StdClass', $std);
-        $this->assertInstanceOf('baz', $std->bar);
+        $this->assertInstanceOf('stdClass', $std);
+        $this->assertEquals('baz', $std->bar);
     }
 }