Make rootPath part of regex greedy #10979
Closed
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
|
Can you also add a test covering the bug to avoid regressions ? |
|
@stof Added a test for that. I did need to refactor Kernel a bit to do that. |
| * | ||
| * @return null|string | ||
| */ | ||
| protected function getRealRootDir() |
There was a problem hiding this comment.
This should be private (use reflection to make it callable in your tests).
|
Just for reference, this issue has been introduced in #10894 |
fabpot
added a commit
that referenced
this pull request
May 26, 2014
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10979). Discussion ---------- Make rootPath part of regex greedy - Fixes #10977 - Also replaced `isset() && true` with simple `!empty()` which is equivalent. Commits ------- 31da839 Make rootPath part of regex greedy
fabpot
added a commit
that referenced
this pull request
May 26, 2014
* 2.3: Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)" Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)" Revert "fixed CS" Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)" Revert "[HttpKernel] simplified some tests" [HttpKernel] simplified some tests Make rootPath part of regex greedy Conflicts: src/Symfony/Component/HttpKernel/Tests/KernelTest.php
fabpot
added a commit
that referenced
this pull request
May 26, 2014
* 2.4: Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)" Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)" Revert "fixed CS" Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)" Revert "[HttpKernel] simplified some tests" [HttpKernel] simplified some tests Make rootPath part of regex greedy
fabpot
added a commit
that referenced
this pull request
May 26, 2014
* 2.5: Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)" Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)" Revert "fixed CS" Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)" Revert "[HttpKernel] simplified some tests" [HttpKernel] simplified some tests Make rootPath part of regex greedy
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.
isset() && truewith simple!empty()which is equivalent.