This repository has been archived by the owner on Jan 21, 2020. It is now read-only.
PSR-11 Container Interface #33
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
Instead of using a custom regex, nikic suggests to use parsed results: nikic/FastRoute#66 (comment) This also throws errors for missing mandatory parameters (#30).
There was a problem hiding this comment.
@xtreamwayz looks good overall but I left some feedback for a minor docblock typo and for a str_replace(...) call that might not actually be necessary.
src/FastRouteRouter.php
Outdated
| * @throws Exception\InvalidArgumentException if the route name is not | ||
| * known. | ||
| * @throws Exception\InvalidArgumentException if the route name is not known or | ||
| * or a parameter value does not match its regex. |
src/FastRouteRouter.php
Outdated
| } | ||
|
|
||
| // Check substitute value with regex | ||
| $regex = '~^' . str_replace('/', '\/', $part[1]) . '$~'; |
There was a problem hiding this comment.
I'm not 100% clear on why the str_replace is necessary here. If we're adding ~ to the start and end, preg_match doesn't need the forward slashes escaped. For instance, if $part[1] is foo/bar/baz, then all of the following return 1:
preg_match('/^foo\/bar\/baz$/', $part[1]);preg_match('~^foo\/bar\/baz$~', $part[1]);preg_match('~^foo/bar/baz$~', $part[1]);
If I haven't misunderstood something, then I suggest we remove line 288 and replace the next line with:
if (! preg_match('~^' . $part[1] . '$~', $substitutions[$part[0]])) {
geerteltink
added a commit
that referenced
this pull request
Aug 11, 2017
PSR-11 Container Interface
geerteltink
added a commit
that referenced
this pull request
Aug 11, 2017
geerteltink
added a commit
that referenced
this pull request
Aug 11, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Built on top of #32