[Routing] Fix the matching process #4170
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
fabpot
added a commit
that referenced
this pull request
May 7, 2012
Commits ------- a196ca0 [Routing] Compiler: remove lazy quantifiers with no effect 8232aa1 [Routing] Compiler: fix in the computing of the segment separators Discussion ---------- [Routing] Fix the matching process This PR is based on the PR #3678, #4139. [](http://travis-ci.org/vicb/symfony) **The spec** A pattern is composed of both text and variable segments: `/{variable}-test/{other_variable}`. A variable segment will match anything until a separator is encountered. The separator is the character following the variable segment when available or preceding the variable otherwise (i.e. at the end of the pattern). That is: * the separator is `-` for the `variable`, * the separator is `/` for the `other_variable`. *Note: This default matching behavior can be overridden if a requirement is specified for a variable)* **Fixes** * The current behavior is to consider booth the preceding and following characters as separators (considering availability), * The "preceding" separator of the first variable is always set to `/` whatever the preceding character is (due to `$pos = 0` for the first iteration). **Todo** Update the doc once this is merged
vicb
added a commit
to vicb/symfony
that referenced
this pull request
May 7, 2012
fabpot
added a commit
that referenced
this pull request
May 7, 2012
Commits ------- 9907df2 [Routing] Fix a regression introduced by #4170 Discussion ---------- [Routing] Fix a regression introduced by #4170 See 8232aa1#commitcomment-1300310 Let's wait to confirm the fix is ok before merging @stephpy, @mvrhov ? (Travis is not ok since 5.3.3 is not supported). --------------------------------------------------------------------------- by stephpy at 2012-05-07T16:17:44Z Yes it's OK ! Thanks :) --------------------------------------------------------------------------- by Tobion at 2012-05-07T16:20:38Z So your originally proposed spec is not the same anymore. --------------------------------------------------------------------------- by vicb at 2012-05-07T16:22:38Z @Tobion * fixed. * no it is not as it couldn't work in this case.
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.
This PR is based on the PR #3678, #4139.
The spec
A pattern is composed of both text and variable segments:
/{variable}-test/{other_variable}.A variable segment will match anything until a separator is encountered. The separator is the character following the variable segment when available or preceding the variable otherwise (i.e. at the end of the pattern).
That is:
-for thevariable,/for theother_variable.Note: This default matching behavior can be overridden if a requirement is specified for a variable)
Fixes
/whatever the preceding character is (due to$pos = 0for the first iteration).Todo
Update the doc once this is merged