[WebServerBundle] Fix router script option BC #23173
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
stof
requested changes
Jun 14, 2017
| $this->router = $router ?: __DIR__.'/Resources/router.php'; | ||
| $this->router = $router ? realpath($router) : __DIR__.'/Resources/router.php'; | ||
|
|
||
| if (false === $this->router || !file_exists($this->router)) { |
There was a problem hiding this comment.
I think the file existence validation could be skipped when using the built-in one. We already know it exists:
if (null !== $router) {
$absoluteRouterPath = realpath($router);
if (false === $absoluteRouterPath || !file_exists($absoluteRouterPath)) {
throw new \InvalidArgumentException(sprintf('Router script "%s" does not exists.', $router));
}
$this->router = $absoluteRouterPath;
} else {
$this->router = __DIR__.'/Resources/router.php';
}There was a problem hiding this comment.
I think that realpath returns false when the file dont not exist anyway. That'd means the file_exists check is useless, isn't it?
e63b990 to
8ba667c
Compare
fabpot
approved these changes
Jun 16, 2017
| $absoluteRouterPath = realpath($router); | ||
|
|
||
| if (false === $absoluteRouterPath) { | ||
| throw new \InvalidArgumentException(sprintf('Router script "%s" does not exists.', $router)); |
8ba667c to
aeab2fe
Compare
nicolas-grekas
approved these changes
Jun 16, 2017
aeab2fe to
5840c09
Compare
|
Thank you @1ed. |
fabpot
added a commit
that referenced
this pull request
Jun 16, 2017
This PR was merged into the 3.3 branch. Discussion ---------- [WebServerBundle] Fix router script option BC | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23206 | License | MIT | Doc PR | - Server commands does not work with router script given by a relative path eg.: ``` bin/console server:run -r router.php ``` but, this was working before and was removed (by accident I guess) in https://github.com/symfony/symfony/pull/21039/files#diff-b915f83f99a4166eb34eab581a92501bL187 Commits ------- aeab2fe [WebServerBundle] Fix router script path and check existence
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.
Server commands does not work with router script given by a relative path eg.:
but, this was working before and was removed (by accident I guess) in https://github.com/symfony/symfony/pull/21039/files#diff-b915f83f99a4166eb34eab581a92501bL187