[ExpressionLanguage] throws an exception on calling uncallable method #24041
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
| @@ -77,8 +77,11 @@ public function evaluate($functions, $values) | |||
| if (!is_object($obj)) { | |||
| throw new \RuntimeException('Unable to get a property on a non-object.'); | |||
| } | |||
| if (($toCall = array($obj, $this->nodes['attribute']->attributes['value'])) && !is_callable($toCall)) { | |||
There was a problem hiding this comment.
if (!is_callable($toCall = array($obj, $this->nodes['attribute']->attributes['value']))) {
There was a problem hiding this comment.
@nicolas-grekas fixed
| @@ -164,6 +164,15 @@ public function testRegisterAfterEval($registerCallback) | |||
| } | |||
|
|
|||
| /** | |||
| * @expectedException \RuntimeException | |||
There was a problem hiding this comment.
please add also an @expectedExceptionMessage annotation
There was a problem hiding this comment.
Done. I did not add before to be consistent with the codebase in this component. I use @expectedExceptionMessageRegExp instead :)
nicolas-grekas
approved these changes
Sep 4, 2017
chalasr
approved these changes
Sep 4, 2017
fabpot
approved these changes
Sep 5, 2017
|
Thank you @fmata. |
fabpot
added a commit
that referenced
this pull request
Sep 5, 2017
…able method (fmata)
This PR was merged into the 2.7 branch.
Discussion
----------
[ExpressionLanguage] throws an exception on calling uncallable method
| Q | A
| ------------- | ---
| Branch? | 2.7
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | n/a
| License | MIT
| Doc PR | n/a
When we evaluate an expression, if a callable is incorrect (not exists or not accessible) a warning is printed.
This PR handles this case and throws a \RuntimeException when `is_callable()` returns `false` :
```php
$el = new ExpressionLanguage();
$el->evaluate('foo.myfunction()', array('foo' => new \stdClass()));
```
**Before:**
`Warning: call_user_func_array() expects parameter 1 to be a valid callback, class 'stdClass' does not have a method 'myfunction' in /home/.../src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php on line 84`
**After:**
`Fatal error: Uncaught RuntimeException: Unable to call method "myfunction" of object "stdClass". in /home/.../src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php:81`
Commits
-------
c8b65ae [ExpressionLanguage] throws an exception on calling uncallable method
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.
When we evaluate an expression, if a callable is incorrect (not exists or not accessible) a warning is printed.
This PR handles this case and throws a \RuntimeException when
is_callable()returnsfalse:Before:
Warning: call_user_func_array() expects parameter 1 to be a valid callback, class 'stdClass' does not have a method 'myfunction' in /home/.../src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php on line 84After:
Fatal error: Uncaught RuntimeException: Unable to call method "myfunction" of object "stdClass". in /home/.../src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php:81