[HttpKernel] removed absolute paths from the generated container #10894
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 should clearly be covered by tests |
| return $content; | ||
| } | ||
|
|
||
| $cacheDir = $this->getCacheDir(); |
There was a problem hiding this comment.
Could be moved below the while loop, because not used before
|
This one should be ready now. |
| $rootDir = $this->getRootDir(); | ||
| $previous = $rootDir; | ||
| while (!file_exists($rootDir.'/composer.json')) { | ||
| if ($previous === $rootDir = realpath($rootDir.'/..')) { |
There was a problem hiding this comment.
shoudln't $previous be updated in the loop too ?
There was a problem hiding this comment.
right, fixed it now and added a test about that.
There was a problem hiding this comment.
@fabpot I think this stuff (the preg_replace_callback below) breaks the console. kernel.rootpath is now at app/cache/dev/../src can be reproduced by generating a bundle
There was a problem hiding this comment.
@wouterj thanks for the pointer
fabpot
added a commit
that referenced
this pull request
May 17, 2014
…tainer (fabpot) This PR was merged into the 2.3 branch. Discussion ---------- [HttpKernel] removed absolute paths from the generated container | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | first step to resolve #6484, #3079, and #9238 | License | MIT | Doc PR | n/a This PR converts absolute paths to relative ones in the dumped container. The code is a bit "ugly", but it gets the job done and I'm not sure that there is a more elegant way without breaking everything. Commits ------- c1450b4 [HttpKernel] removed absolute paths from the generated container
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
fabpot
added a commit
that referenced
this pull request
Dec 2, 2014
…e generated container (nicolas-grekas) This PR was merged into the 2.3 branch. Discussion ---------- [DependencyInjection] make paths relative to __DIR__ in the generated container | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #6484, #3079, partially #9238, #10894, #10999 | License | MIT | Doc PR | n/a This is an alternative approach to #10999 for removing absolute paths from the generated container: instead of trying to fix the container file after it has been dumped, telling to the PhpDumper where its output will be written allows it to replace parts of strings by an equivalent value based on `__DIR__`. This should be safe, thus the PR is on 2.3. Commits ------- edd7057 [DependencyInjection] make paths relative to __DIR__ in the generated container
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.
This PR converts absolute paths to relative ones in the dumped container. The code is a bit "ugly", but it gets the job done and I'm not sure that there is a more elegant way without breaking everything.