diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source 
* 2.3:
  fixed CS
  Fix "absolute path" when we look to the cache directory
This commit is contained in:
Fabien Potencier 2014-05-18 17:36:48 +02:00
commit 04fb11305f
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/HttpKernel/Kernel.php
View File

@ -746,9 +746,13 @@ abstract class Kernel implements KernelInterface, TerminableInterface
$filesystem = new Filesystem();
return preg_replace_callback("{'([^']*)(".preg_quote($rootDir)."[^']*)'}", function ($match) use ($filesystem, $cacheDir) {
$prefix = isset($match[1]) && $match[1] ? "'$match[1]'.__DIR__.'/" : "__DIR__.'/";
$prefix = isset($match[1]) && $match[1] ? "'$match[1]'.__DIR__" : "__DIR__";
return $prefix.rtrim($filesystem->makePathRelative($match[2], $cacheDir), '/')."'";
if ('.' === $relativePath = rtrim($filesystem->makePathRelative($match[2], $cacheDir), '/')) {
return $prefix;
}
return $prefix.".'/".$relativePath."'";
}, $content);
}

1
src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withAbsolutePaths.php vendored
View File

@ -1,6 +1,7 @@
'ROOT_DIR/app/cache/dev/foo'
'ROOT_DIR/app/cache/foo'
'ROOT_DIR/foo/bar.php'
'ROOT_DIR/app/cache/dev'
'/some/where/else/foo'

1
src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withoutAbsolutePaths.php vendored
View File

@ -1,6 +1,7 @@
__DIR__.'/foo'
__DIR__.'/../foo'
__DIR__.'/../../../foo/bar.php'
__DIR__
'/some/where/else/foo'