Fix - #17676 (backport #17919 to 2.3) #17947
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
| "ocramius/proxy-manager": "~0.3.1|~1.0|~2.0", | ||
| "phpdocumentor/reflection": "^1.0.7" | ||
| }, | ||
| "conflict": { |
There was a problem hiding this comment.
Too much stuff slipped in here. Need to get rid of a few of those.
c659cbf to
d440b18
Compare
d440b18 to
160a03e
Compare
| @@ -11,6 +11,7 @@ | |||
|
|
|||
| namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper; | |||
|
|
|||
| use ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\StaticProxyConstructor; | |||
…Manager 2.x by detecting proxy features
160a03e to
0c6400a
Compare
|
Thank you @Ocramius. |
fabpot
added a commit
that referenced
this pull request
Feb 28, 2016
This PR was merged into the 2.3 branch. Discussion ---------- Fix - #17676 (backport #17919 to 2.3) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17676 | License | MIT | Doc PR | This is a backport of #17919 Commits ------- 0c6400a #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
This was referenced Feb 28, 2016
Merged
Merged
Merged
Merged
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 is a backport of #17919