[Routing] Account for greediness when merging route patterns #27388
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
stof
reviewed
May 25, 2018
| @@ -103,6 +103,8 @@ public function addRoute(string $prefix, $route, string $staticPrefix = null) | |||
| if ($item instanceof self && $this->prefixes[$i] === $commonPrefix) { | |||
| // the new route is a child of a previous one, let's nest it | |||
| $item->addRoute($prefix, $route, $staticPrefix); | |||
| } elseif ($commonPrefix === $prefix && $commonStaticPrefix !== $prefix) { | |||
There was a problem hiding this comment.
we should also have a comment describing this case in the algorithm
|
These diffs on the dumped code are quite unreadable for reviewers... |
|
PR updated. |
nicolas-grekas
added a commit
that referenced
this pull request
May 25, 2018
…ns (nicolas-grekas) This PR was merged into the 4.1 branch. Discussion ---------- [Routing] Account for greediness when merging route patterns | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #27385 | License | MIT | Doc PR | - Sub-patterns of variable length should not be considered as common prefixes because their greediness would break in-order matching. Commits ------- d5a8237 [Routing] Account for greediness when merging route patterns
|
Thank you @nicolas-grekas |
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.
Sub-patterns of variable length should not be considered as common prefixes because their greediness would break in-order matching.