Merge branch 'hotfix/3'

Close #3

Author: weierophinney

CHANGELOG.md

@@ -0,0 +1,24 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 2.5.2 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#3](https://github.com/zendframework/zend-servicemanager/pull/3) properly updates the
+  codebase to PHP 5.5, by taking advantage of the default closure binding
+  (`$this` in a closure is the invoking object when created within a method). It
+  also removes several `@requires PHP 5.4.0` annotations.

src/AbstractPluginManager.php

@@ -62,10 +62,9 @@ abstract class AbstractPluginManager extends ServiceManager implements ServiceLo
     public function __construct(ConfigInterface $configuration = null)
     {
         parent::__construct($configuration);
-        $self = $this;
-        $this->addInitializer(function ($instance) use ($self) {
+        $this->addInitializer(function ($instance) {
             if ($instance instanceof ServiceLocatorAwareInterface) {
-                $instance->setServiceLocator($self);
+                $instance->setServiceLocator($this);
             }
         });
     }

src/ServiceManager.php

@@ -610,12 +610,10 @@ public function create($name)
      */
     private function createDelegatorCallback($delegatorFactory, $rName, $cName, $creationCallback)
     {
-        $serviceManager  = $this;
-
-        return function () use ($serviceManager, $delegatorFactory, $rName, $cName, $creationCallback) {
+        return function () use ($delegatorFactory, $rName, $cName, $creationCallback) {
             return $delegatorFactory instanceof DelegatorFactoryInterface
-                ? $delegatorFactory->createDelegatorWithName($serviceManager, $cName, $rName, $creationCallback)
-                : $delegatorFactory($serviceManager, $cName, $rName, $creationCallback);
+                ? $delegatorFactory->createDelegatorWithName($this, $cName, $rName, $creationCallback)
+                : $delegatorFactory($this, $cName, $rName, $creationCallback);
         };
     }
 
@@ -628,9 +626,8 @@ private function createDelegatorCallback($delegatorFactory, $rName, $cName, $cre
      * @return bool|mixed|null|object
      * @throws Exception\ServiceNotFoundException
      *
-     * @internal this method is internal because of PHP 5.3 compatibility - do not explicitly use it
      */
-    public function doCreate($rName, $cName)
+    protected function doCreate($rName, $cName)
     {
         $instance = null;
 
@@ -1188,10 +1185,9 @@ protected function checkNestedContextStop($force = false)
      */
     protected function createDelegatorFromFactory($canonicalName, $requestedName)
     {
-        $serviceManager     = $this;
         $delegatorsCount    = count($this->delegators[$canonicalName]);
-        $creationCallback   = function () use ($serviceManager, $requestedName, $canonicalName) {
-            return $serviceManager->doCreate($requestedName, $canonicalName);
+        $creationCallback   = function () use ($requestedName, $canonicalName) {
+            return $this->doCreate($requestedName, $canonicalName);
         };
 
         for ($i = 0; $i < $delegatorsCount; $i += 1) {
@@ -1220,7 +1216,7 @@ protected function createDelegatorFromFactory($canonicalName, $requestedName)
             );
         }
 
-        return $creationCallback($serviceManager, $canonicalName, $requestedName, $creationCallback);
+        return $creationCallback($this, $canonicalName, $requestedName, $creationCallback);
     }
 
     /**

test/MutableCreationOptionsTraitTest.php

@@ -11,9 +11,6 @@
 
 use PHPUnit_Framework_TestCase as TestCase;
 
-/**
- * @requires PHP 5.4.0
- */
 class MutableCreationOptionsTraitTest extends TestCase
 {
     protected $stub;

test/ServiceLocatorAwareTraitTest.php

@@ -13,7 +13,6 @@
 use Zend\ServiceManager\ServiceManager;
 
 /**
- * @requires PHP 5.4
  * @group    Zend_ServiceManager
  */
 class ServiceLocatorAwareTraitTest extends TestCase

test/ServiceManagerTest.php

@@ -714,15 +714,13 @@ public function testGetGlobIteratorServiceWorksProperly()
 
     public function duplicateService()
     {
-        $self = $this;
-
         return [
             [
                 'setFactory',
-                function ($services) use ($self) {
-                    return $self;
+                function ($services) {
+                    return $this;
                 },
-                $self,
+                $this,
                 'assertSame',
             ],
             [
@@ -733,8 +731,8 @@ function ($services) use ($self) {
             ],
             [
                 'setService',
-                $self,
-                $self,
+                $this,
+                $this,
                 'assertSame',
             ],
         ];