[Routing] make xml loader more tolerant #7268
Merged
Conversation
This file contains 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
schemes and methods may also be delimited by whitespace, comma or pipe. this eases migration as now schemes="GET|POST" also works
| $schemes = array_filter(explode(' ', $node->getAttribute('schemes'))); | ||
| $methods = array_filter(explode(' ', $node->getAttribute('methods'))); | ||
| $schemes = preg_split('/[\s,\|]++/', $node->getAttribute('schemes'), -1, PREG_SPLIT_NO_EMPTY); | ||
| $methods = preg_split('/[\s,\|]++/', $node->getAttribute('methods'), -1, PREG_SPLIT_NO_EMPTY); |
There was a problem hiding this comment.
It prevents backtracking. So its a performance thing (which I also implemented for UrlMatching/route compiling some time ago).
There was a problem hiding this comment.
I would say it's a micro-optim which:
- makes the code unclear,
- is really useless as you want to use the compiled version where perf matters.
There was a problem hiding this comment.
Well its standard syntax for regular expressions. Just less known.
There was a problem hiding this comment.
btw where could there be any backtracking here ?
There was a problem hiding this comment.
(but thanks for the tip++ anyway!)
fabpot
added a commit
that referenced
this pull request
Mar 6, 2013
This PR was merged into the 2.2 branch. Commits ------- 54c333d [Routing] unify and fix the loader tests 41ad9d8 [Routing] make xml loader more tolerant Discussion ---------- [Routing] make xml loader more tolerant schemes and methods may also be delimited by whitespace, comma or pipe. Fixes #6049 (comment) this eases migration as now `methods="GET|POST"` also works the second commit unifies the tests and fixes some strange assertions that were useless | Q | A | ------------- | --- | Bug fix? | [yes] | New feature? | [yes but not really] | BC breaks? | [no] | Deprecations? | [no] | Tests pass? | [yes] | License | MIT
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.
schemes and methods may also be delimited by whitespace, comma or pipe.
Fixes #6049 (comment)
this eases migration as now
methods="GET|POST"also worksthe second commit unifies the tests and fixes some strange assertions that were useless