Fix twig_test_empty and twig_length_filter to not trigger autoloading #2438
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
This was referenced Apr 6, 2017
SpacePossum
reviewed
Apr 6, 2017
| @@ -1241,7 +1241,7 @@ function twig_test_empty($value) | |||
| return 0 == count($value); | |||
| } | |||
|
|
|||
| if (method_exists($value, '__toString')) { | |||
| if (is_object($value) && method_exists($value, '__toString')) { | |||
There was a problem hiding this comment.
can be optimized, as the is_object test is now always done there is not point for the test at line 1280 (return '' === $value || false === $value || null === $value || array() === $value;) if is_object returned true
There was a problem hiding this comment.
You mean like this?
if (is_object($value)) {
if (method_exists($value, '__toString')) {
return '' === (string) $value;
} else {
return false;
}
}
return '' === $value || false === $value || null === $value || array() === $value;Should I use ternary operator?
if (is_object($value)) {
return method_exists($value, '__toString') ? '' === (string) $value : false;
}
return '' === $value || false === $value || null === $value || array() === $value;|
@mpdude Right... twig_length_filter doesn't need to be changed because of is_scalar check. So the only thing left is the optimization that @SpacePossum suggested. |
|
the optimize might not be worth a PR I guess |
|
Alright. In that case I'll just wait for the 1.x branch to be merged into 2.x. Thank you both. |
nicolas-grekas
added a commit
to symfony/symfony
that referenced
this pull request
Apr 7, 2017
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #22307). Discussion ---------- [Debug] Fix php notice | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Of course autoloading of an empty string should not actually happen (fixed that in twigphp/Twig#2438) but if it does happen it should not throw a php notice. ``` Notice: Uninitialized string offset 0 ``` Commits ------- e333a1a [Debug] Fix php notice
symfony-splitter
pushed a commit
to symfony/debug
that referenced
this pull request
Apr 7, 2017
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #22307). Discussion ---------- [Debug] Fix php notice | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Of course autoloading of an empty string should not actually happen (fixed that in twigphp/Twig#2438) but if it does happen it should not throw a php notice. ``` Notice: Uninitialized string offset 0 ``` Commits ------- e333a1a [Debug] Fix php notice
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.
Introduced in #2420, partially fixed in #2433.
cc @mpdude
Also because of this I found another bug in both Symfony and Composer - autoloading fails for an empty string. I'll send pull requests to both shortly.