[FrameworkBundle] Use relative paths in templates paths cache #19687
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
| @@ -23,20 +23,25 @@ class TemplateLocator implements FileLocatorInterface | |||
| { | |||
| protected $locator; | |||
| protected $cache; | |||
| protected $rootDir; | |||
6aec93e to
2bb53d3
Compare
|
Travis failure is not related (PHP 7.1 segfault). |
| $path = $this->locator->locate($template->getPath(), $currentPath); | ||
|
|
||
| if ($this->rootDir && 0 === strpos($path, $this->rootDir)) { | ||
| return $this->rootDir.($this->cache[$key] = './'.substr($path, strlen($this->rootDir))); |
There was a problem hiding this comment.
Tip: As the length of the rootDir doesn't change at runtime you can cache it as a property or static local variable.
5276db5 to
4f601e8
Compare
|
LGTM. |
4f601e8 to
6f6139c
Compare
|
👍 |
| @@ -32,7 +32,7 @@ class TemplateLocator implements FileLocatorInterface | |||
| */ | |||
| public function __construct(FileLocatorInterface $locator, $cacheDir = null) | |||
| { | |||
| if (null !== $cacheDir && is_file($cache = $cacheDir.'/templates.php')) { | |||
| if (null !== $cacheDir && file_exists($cache = $cacheDir.'/templates.php')) { | |||
There was a problem hiding this comment.
file_exists is faster and is_file have no advantage over it here.
|
👍 |
|
Thank you @tgalopin. |
fabpot
added a commit
that referenced
this pull request
Aug 23, 2016
…s cache (tgalopin) This PR was merged into the 3.2-dev branch. Discussion ---------- [FrameworkBundle] Use relative paths in templates paths cache | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #3079 | License | MIT | Doc PR | - This implements the usage of relative paths instead of absolute ones in `var/cache/*/templates.php`, important for ability to build the cache in a different context than where it will be used. This PR transforms the following `templates.php`: ``` php <?php return array ( ':default:index.html.twig' => '/home/tgalopin/www/symfony-standard/app/Resources/views/default/index.html.twig', '::base.html.twig' => '/home/tgalopin/www/symfony-standard/app/Resources/views/base.html.twig', ); ``` Into: ``` php <?php return array ( ':default:index.html.twig' => __DIR__.'/../../../app/Resources/views/default/index.html.twig', '::base.html.twig' => __DIR__.'/../../../app/Resources/views/base.html.twig', ); ``` I also added tests for the TemplateCachePathsWarmer and improved tests for the TemplateLocator. Commits ------- 6f6139c [FrameworkBundle] Use relative paths in templates paths cache
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.
This implements the usage of relative paths instead of absolute ones in
var/cache/*/templates.php, important for ability to build the cache in a different context than where it will be used.This PR transforms the following
templates.php:Into:
I also added tests for the TemplateCachePathsWarmer and improved tests for the TemplateLocator.