[Routing] Disallow object usage inside Route #27727
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
faaa501 to
59f5f54
Compare
stof
approved these changes
Jun 26, 2018
| @@ -746,6 +746,10 @@ public static function export($value): string | |||
| return 'null'; | |||
| } | |||
| if (!\is_array($value)) { | |||
| if (\is_object($value)) { | |||
There was a problem hiding this comment.
if (\is_object($value) && !method_exists($value, '__set_state')) {
There was a problem hiding this comment.
even objects with __set_state are broken, as the logic currently replaces new lines by a concatenation with "\n" instead (because when var_export-ing a scalar, new lines appear only inside strings).
If we want to keep support for objects with __set_state, it should be handled as a separate case (and I would put it before the if (!is_array()) case then, rather than nesting in it)
There was a problem hiding this comment.
even objects with __set_state are broken
indeed, then let's keep it unsupported :)
There was a problem hiding this comment.
The purpose of this PR is to disallow object usage, and avoid to export objects (via var_export). Thus, the fact that __set_state exists or not is not relevant. The dumped file does not work when we export an object (because of \n replacements).
Did not see the comments above :)
| @@ -746,6 +746,10 @@ public static function export($value): string | |||
| return 'null'; | |||
| } | |||
| if (!\is_array($value)) { | |||
| if (\is_object($value)) { | |||
| throw new \InvalidArgumentException('Symfony\Component\Routing\Route cannot contain objects'); | |||
There was a problem hiding this comment.
missing dot at end of message
59f5f54 to
f1b3ffc
Compare
…Bonfante) This PR was submitted for the master branch but it was squashed and merged into the 4.1 branch instead (closes symfony#27754). Discussion ---------- [HttpFoundation] missing namespace for RedisProxy I think the intention was to check if is instance of \Symfony\Component\Cache\Traits\RedisProxy | Q | A | ------------- | --- | Branch? | 4.1 (becareful when merging) | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | <!-- Write a short README entry for your feature/bugfix here (replace this comment block.) This will help people understand your PR and can be used as a start of the Doc PR. Additionally: - Bug fixes must be submitted against the lowest branch where they apply (lowest branches are regularly merged to upper ones so they get the fixes too). - Features and deprecations must be submitted against the master branch. --> Commits ------- 8e0acfc [HttpFoundation] missing namespace for RedisProxy
…regex (nicolas-grekas) This PR was merged into the 4.1 branch. Discussion ---------- [Routing] fix too much greediness in host-matching regex | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#27721 | License | MIT | Doc PR | - Commits ------- e16b302 [Routing] fix too much greediness in host-matching regex
f1b3ffc to
426fb45
Compare
|
Thank you @paxal. |
nicolas-grekas
added a commit
that referenced
this pull request
Jun 28, 2018
This PR was submitted for the master branch but it was merged into the 4.1 branch instead (closes #27727). Discussion ---------- [Routing] Disallow object usage inside Route | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | ? | Fixed tickets | #27723 | License | MIT | Doc PR | ✘ As discussed in #27723 the `Route` object should not support nested objects as attributes (`requirements`, `defaults`, ...). Thus, if detected, an `\InvalidArgumentException` will be thrown. Will fix #27723 Commits ------- 426fb45 [Routing] Disallow object usage inside Route
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.
As discussed in #27723 the
Routeobject should not support nested objects as attributes (requirements,defaults, ...).Thus, if detected, an
\InvalidArgumentExceptionwill be thrown.Will fix #27723