8000 [EventDispatcher] fix merge of #22541 from 2.8 by dmaicher · Pull Request #22602 · symfony/symfony · GitHub
[go: up one dir, main page]

Skip to content

[EventDispatcher] fix merge of #22541 from 2.8 #22602

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

Merged
merged 1 commit into from
May 2, 2017

Conversation

dmaicher
Copy link
Contributor
@dmaicher dmaicher commented May 1, 2017
Q A
Branch? 3.2
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets -
License MIT
Doc PR -

This cleans up a test case that was merged from 2.8 into 3.2 here: 824dc8b

@fabpot due to different implementations I created 2 PR's:

2.8: #22541
3.2: #22568

So the 2.8 merge into 3.2 of my change-set introduced some unused variable $isWrapped here: 824dc8b#diff-af3c4fbca8bb77957c00087543ae5a4dR113

This PR just cleans it up and also removes the data provider 😉

use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\Event;
Copy link
Member

Choose a reason for hiding this comment

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

The reordering should be reverted.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@nicolas-grekas
Copy link
Member

Thank you @dmaicher.

@nicolas-grekas nicolas-grekas merged commit f67eba8 into symfony:3.2 May 2, 2017
nicolas-grekas added a commit that referenced this pull request May 2, 2017
This PR was merged into the 3.2 branch.

Discussion
----------

[EventDispatcher] fix merge of #22541 from 2.8

| Q             | A
| ------------- | ---
| Branch?       | 3.2
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This cleans up a test case that was merged from 2.8 into 3.2 here: 824dc8b

@fabpot due to different implementations I created 2 PR's:

2.8: #22541
3.2: #22568

So the 2.8 merge into 3.2 of my change-set introduced some unused variable `$isWrapped` here: 824dc8b#diff-af3c4fbca8bb77957c00087543ae5a4dR113

This PR just cleans it up and also removes the data provider 😉

Commits
-------

f67eba8 [EventDispatcher] fix merge of #22541 from 2.8
@dmaicher dmaicher deleted the test-cleanup branch May 2, 2017 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants
0