[EventDispatcher] fix merge of #22541 from 2.8 #22602
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fabpot
reviewed
May 1, 2017
| use Symfony\Component\EventDispatcher\EventDispatcherInterface; | ||
| use Symfony\Component\EventDispatcher\EventSubscriberInterface; | ||
| use Symfony\Component\EventDispatcher\EventDispatcher; | ||
| use Symfony\Component\EventDispatcher\Event; |
There was a problem hiding this comment.
The reordering should be reverted.
|
Thank you @dmaicher. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
$isWrappedhere: 824dc8b#diff-af3c4fbca8bb77957c00087543ae5a4dR113This PR just cleans it up and also removes the data provider 😉