[Router] added \Z as regex end for route requirement #37714
Closed
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
|
This looks like unneeded precaution to me. New lines are not legit in URLs. |
| @@ -563,7 +563,7 @@ private function sanitizeRequirement(string $key, string $regex) | |||
|
|
|||
| if ('$' === substr($regex, -1)) { | |||
| $regex = substr($regex, 0, -1); | |||
| } elseif (\strlen($regex) - 2 === strpos($regex, '\\z')) { | |||
There was a problem hiding this comment.
Unrelated to the PR: couldn't this be written as this?
} elseif (false !== strpos($regex, '\\z', -2)) {
There was a problem hiding this comment.
@nicolas-grekas tried strpos and strrpos:
strpos(): Offset not contained in string in .... (strpos doesn't accept negative offset)
strrpos(): Offset is greater than the length of haystack string
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.
In previous PR (#37711) I added
/Aand/z, but$in regex is/z+/Z.Thanks @rvitaliy: #37711 (comment)
References:
^ and $: https://www.pcre.org/original/doc/html/pcrepattern.html#TOC1
\A, \z, \Z: https://www.pcre.org/original/doc/html/pcrepattern.html#SEC5