Fix failing tests after merge #12967
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
|
@nicolas-grekas This is basically the same as #12963. |
| } elseif (null !== $object) { | ||
| if (!method_exists($object, $method)) { | ||
| throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist', $method)); | ||
| } |
There was a problem hiding this comment.
Ah, I didn't fix this in #12963.
3f7f1cf to
80473d8
Compare
|
I just cherry-picked your fix so that the combinaison of both fixes have a chance to make tests green |
|
@nicolas-grekas Thanks, though that was not really necessary since you fixed it in the same way. I closed #12963 in the meantime. The question remains if we should also allow |
Symfony 2.5 and higher requires ocramius/proxy-manager 0.4.0 or higher.
80473d8 to
9b96373
Compare
|
Just added ~1.0 (but not 2.0 since it's a dev branch) |
|
Thank you @nicolas-grekas. |
fabpot
added a commit
that referenced
this pull request
Dec 13, 2014
This PR was merged into the 2.5 branch. Discussion ---------- Fix failing tests after merge | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - https://github.com/symfony/symfony/pull/12967/files?w=1 Commits ------- 9b96373 Fix failing tests after merge 6638535 fix ocramius/proxy-manager dependency version
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.
https://github.com/symfony/symfony/pull/12967/files?w=1