Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove $self = $this; use ($self) in 5.4 #6

Merged
merged 2 commits into from
Jan 14, 2015

Conversation

samsonasik
Copy link

ping @carnage I created a PR for your suggestion.

if ($instance instanceof ServiceLocatorAwareInterface) {
$instance->setServiceLocator($self);
$instance->setServiceLocator($this);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it makes test error,

1) ZendTest\ServiceManager\AbstractPluginManagerTest::testValidatePluginIsCalledWithDelegatorFactoryIfItsAService

Undefined variable: serviceManager

maybe rollback it ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, its strange, seems not related with it...

@@ -605,12 +605,10 @@ public function create($name)
*/
private function createDelegatorCallback($delegatorFactory, $rName, $cName, $creationCallback)
{
$serviceManager = $this;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Careful with the delegators: they're messy ;-)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made a rollback change on samsonasik@68a626a , and in my local the test is pass now.

@samsonasik
Copy link
Author

@Ocramius yay, travis is green now ;)

@Ocramius
Copy link
Owner

@samsonasik merging, thanks!

Ocramius added a commit that referenced this pull request Jan 14, 2015
remove $self = $this; use ($self) in 5.4
@Ocramius Ocramius merged commit 12cc710 into Ocramius:cleanup/#7095-php-5.3-support-end Jan 14, 2015
@Ocramius Ocramius self-assigned this Jan 14, 2015
@samsonasik samsonasik deleted the 50400 branch January 14, 2015 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants