Merge branch 'cleanup/#5-remove-self-this-assignment-on-php-5-5'

Close #5

Author: Ocramius

composer.json

@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.3.23",
+        "php": ">=5.5",
         "zendframework/zend-eventmanager": "~2.5",
         "zendframework/zend-servicemanager": "~2.5",
         "zendframework/zend-form": "~2.5",
@@ -75,4 +75,4 @@
             "ZendTest\\Mvc\\": "test/"
         }
     }
-}
+}

test/ApplicationTest.php

@@ -596,10 +596,9 @@ public function testReturnsResponseFromListenerWhenRouteEventShortCircuits()
             return $testResponse;
         }, 100);
 
-        $self      = $this;
         $triggered = false;
-        $events->attach(MvcEvent::EVENT_FINISH, function ($e) use ($self, $testResponse, &$triggered) {
-            $self->assertSame($testResponse, $e->getResponse());
+        $events->attach(MvcEvent::EVENT_FINISH, function ($e) use ($testResponse, &$triggered) {
+            $this->assertSame($testResponse, $e->getResponse());
             $triggered = true;
         });
 
@@ -622,10 +621,9 @@ public function testReturnsResponseFromListenerWhenDispatchEventShortCircuits()
             return $testResponse;
         }, 100);
 
-        $self      = $this;
         $triggered = false;
-        $events->attach(MvcEvent::EVENT_FINISH, function ($e) use ($self, $testResponse, &$triggered) {
-            $self->assertSame($testResponse, $e->getResponse());
+        $events->attach(MvcEvent::EVENT_FINISH, function ($e) use ($testResponse, &$triggered) {
+            $this->assertSame($testResponse, $e->getResponse());
             $triggered = true;
         });
 

test/Service/ServiceManagerConfigTest.php

@@ -150,11 +150,10 @@ public function testDefinesServiceManagerService()
      */
     public function testCanOverrideServiceManager()
     {
-        $test           = $this;
         $serviceManager = new ServiceManager(new ServiceManagerConfig(array(
             'factories' => array(
-                'ServiceManager' => function () use ($test) {
-                    return $test;
+                'ServiceManager' => function () {
+                    return $this;
                 }
             ),
         )));