Merge remote-tracking branch 'upstream/develop' into develop

src/AbstractPluginManager.php

@@ -30,7 +30,7 @@ abstract class AbstractPluginManager extends ServiceManager implements ServiceLo
      *
      * @var bool
      */
-    protected $allowOverride   = true;
+    protected $allowOverride = true;
 
     /**
      * Whether or not to auto-add a class as an invokable class if it exists
@@ -69,9 +69,6 @@ public function __construct(ConfigInterface $configuration = null)
             if ($instance instanceof ServiceLocatorAwareInterface) {
                 $instance->setServiceLocator($self);
             }
-            if ($instance instanceof ServiceManagerAwareInterface) {
-                $instance->setServiceManager($self);
-            }
         });
     }
 

src/ServiceLocatorAwareTrait.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_ServiceManager
+ */
+
+namespace Zend\ServiceManager;
+
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * @category  Zend
+ * @package   Zend_ServiceManager
+ */
+trait ServiceLocatorAwareTrait
+{
+    /**
+     * @var ServiceLocator
+     */
+    protected $serviceLocator = null;
+
+    /**
+     * Set service locator
+     *
+     * @param ServiceLocatorInterface $serviceLocator
+     * @return mixed
+     */
+    public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
+    {
+        $this->serviceLocator = $serviceLocator;
+
+        return $this;
+    }
+
+    /**
+     * Get service locator
+     *
+     * @return ServiceLocator
+     */
+    public function getServiceLocator()
+    {
+        return $this->serviceLocator;
+    }
+}

test/ServiceLocatorAwareTraitTest.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_ServiceManager
+ */
+
+namespace ZendTest\ServiceManager;
+
+use \PHPUnit_Framework_TestCase as TestCase;
+use \Zend\ServiceManager\ServiceManager;
+
+/**
+ * @requires PHP 5.4
+ */
+class ServiceLocatorAwareTraitTest extends TestCase
+{
+    public function testSetServiceLocator()
+    {
+        $object = $this->getObjectForTrait('\Zend\ServiceManager\ServiceLocatorAwareTrait');
+
+        $this->assertAttributeEquals(null, 'serviceLocator', $object);
+
+        $serviceLocator = new ServiceManager;
+
+        $object->setServiceLocator($serviceLocator);
+
+        $this->assertAttributeEquals($serviceLocator, 'serviceLocator', $object);
+    }
+
+    public function testGetServiceLocator()
+    {
+        $object = $this->getObjectForTrait('\Zend\ServiceManager\ServiceLocatorAwareTrait');
+
+        $this->assertNull($object->getServiceLocator());
+
+        $serviceLocator = new ServiceManager;
+
+        $object->setServiceLocator($serviceLocator);
+
+        $this->assertEquals($serviceLocator, $object->getServiceLocator());
+    }
+}