Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit 24fcb1e

Browse files
samsonasikOcramius
authored andcommitted
remove $self = $this for PHP >=5.5
1 parent 40efd6e commit 24fcb1e

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"require": {
16-
"php": ">=5.3.23",
16+
"php": ">=5.5",
1717
"zendframework/zend-eventmanager": "~2.5",
1818
"zendframework/zend-servicemanager": "~2.5",
1919
"zendframework/zend-form": "~2.5",
@@ -75,4 +75,4 @@
7575
"ZendTest\\Mvc\\": "test/"
7676
}
7777
}
78-
}
78+
}

test/ApplicationTest.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -596,10 +596,9 @@ public function testReturnsResponseFromListenerWhenRouteEventShortCircuits()
596596
return $testResponse;
597597
}, 100);
598598

599-
$self = $this;
600599
$triggered = false;
601-
$events->attach(MvcEvent::EVENT_FINISH, function ($e) use ($self, $testResponse, &$triggered) {
602-
$self->assertSame($testResponse, $e->getResponse());
600+
$events->attach(MvcEvent::EVENT_FINISH, function ($e) use ($testResponse, &$triggered) {
601+
$this->assertSame($testResponse, $e->getResponse());
603602
$triggered = true;
604603
});
605604

@@ -622,10 +621,9 @@ public function testReturnsResponseFromListenerWhenDispatchEventShortCircuits()
622621
return $testResponse;
623622
}, 100);
624623

625-
$self = $this;
626624
$triggered = false;
627-
$events->attach(MvcEvent::EVENT_FINISH, function ($e) use ($self, $testResponse, &$triggered) {
628-
$self->assertSame($testResponse, $e->getResponse());
625+
$events->attach(MvcEvent::EVENT_FINISH, function ($e) use ($testResponse, &$triggered) {
626+
$this->assertSame($testResponse, $e->getResponse());
629627
$triggered = true;
630628
});
631629

test/Service/ServiceManagerConfigTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,10 @@ public function testDefinesServiceManagerService()
150150
*/
151151
public function testCanOverrideServiceManager()
152152
{
153-
$test = $this;
154153
$serviceManager = new ServiceManager(new ServiceManagerConfig(array(
155154
'factories' => array(
156-
'ServiceManager' => function () use ($test) {
157-
return $test;
155+
'ServiceManager' => function () {
156+
return $this;
158157
}
159158
),
160159
)));

0 commit comments

Comments
 (0)