[Routing] Make important parameters required when matching #29770
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
|
As discussed with @nicolas-grekas , #29763 will be implemented in this PR as well :) |
7ae21c9 to
098ab7b
Compare
vudaltsov
commented
Jan 4, 2019
| @@ -199,7 +197,7 @@ private static function compilePattern(Route $route, $pattern, $isHost) | |||
| if (!$isHost) { | |||
| for ($i = \count($tokens) - 1; $i >= 0; --$i) { | |||
| $token = $tokens[$i]; | |||
| if ('variable' === $token[0] && $route->hasDefault($token[3])) { | |||
| if ('variable' === $token[0] && !$token[5] && $route->hasDefault($token[3])) { | |||
There was a problem hiding this comment.
Here is the change that prevents matching
|
@nicolas-grekas , ready! |
|
CI fails are not relevant (I see some Intl component errors), Routing is green locally :) |
f18a6e1 to
ca35103
Compare
|
Finally green and ready! |
4bd3fc8 to
8d4be10
Compare
8d4be10 to
2c3ab22
Compare
|
@nicolas-grekas , I managed to keep consistency with old tests! |
nicolas-grekas
approved these changes
Jan 25, 2019
|
Thank you @vudaltsov. |
nicolas-grekas
added a commit
that referenced
this pull request
Jan 25, 2019
… (vudaltsov) This PR was merged into the 4.3-dev branch. Discussion ---------- [Routing] Make important parameters required when matching | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #29763 | License | MIT | Doc PR | n/a 1. This PR improves "important" route parameters implementation. Instead of considering `!slug` to be a variable name (which is not correct from my POV and leads to a lot of `'!' === $varName[0]` and `substr($varName, 1)` snippets), I took advantage of the `$token` array and used offset `[5]` for keeping boolean importance flag. This approach improved and simplified code. 1. This PR makes important parameters required when matching according to #29763 Commits ------- 2c3ab22 Made important parameters required when matching
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.
!slugto be a variable name (which is not correct from my POV and leads to a lot of'!' === $varName[0]andsubstr($varName, 1)snippets), I took advantage of the$tokenarray and used offset[5]for keeping boolean importance flag. This approach improved and simplified code.!prefixed placeholders should make them required #29763