diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 002c34b99d..4ba29fcbfa 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -32,7 +32,6 @@ use Symfony\Component\Config\Loader\LoaderResolver; use Symfony\Component\Config\Loader\DelegatingLoader; use Symfony\Component\Config\ConfigCache; use Symfony\Component\ClassLoader\ClassCollectionLoader; -use Symfony\Component\Filesystem\Filesystem; /** * The Kernel is the heart of the Symfony system. @@ -717,43 +716,9 @@ abstract class Kernel implements KernelInterface, TerminableInterface $content = static::stripComments($content); } - $content = $this->removeAbsolutePathsFromContainer($content); - $cache->write($content, $container->getResources()); } - /** - * Converts absolute paths to relative ones in the dumped container. - */ - private function removeAbsolutePathsFromContainer($content) - { - if (!class_exists('Symfony\Component\Filesystem\Filesystem')) { - return $content; - } - - // find the "real" root dir (by finding the composer.json file) - $rootDir = $this->getRootDir(); - $previous = $rootDir; - while (!file_exists($rootDir.'/composer.json')) { - if ($previous === $rootDir = realpath($rootDir.'/..')) { - // unable to detect the project root, give up - return $content; - } - - $previous = $rootDir; - } - - $rootDir = rtrim($rootDir, '/'); - $cacheDir = $this->getCacheDir(); - $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__.'/"; - - return $prefix.rtrim($filesystem->makePathRelative($match[2], $cacheDir), '/')."'"; - }, $content); - } - /** * Returns a loader for the container. * diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withAbsolutePaths.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withAbsolutePaths.php deleted file mode 100644 index 54e0dedc4b..0000000000 --- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withAbsolutePaths.php +++ /dev/null @@ -1,7 +0,0 @@ -'ROOT_DIR/app/cache/dev/foo' -'ROOT_DIR/app/cache/foo' -'ROOT_DIR/foo/bar.php' - -'/some/where/else/foo' - -'file:ROOT_DIR/app/cache/dev/profiler' diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withoutAbsolutePaths.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withoutAbsolutePaths.php deleted file mode 100644 index 09ce8b5683..0000000000 --- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withoutAbsolutePaths.php +++ /dev/null @@ -1,7 +0,0 @@ -__DIR__.'/foo' -__DIR__.'/../foo' -__DIR__.'/../../../foo/bar.php' - -'/some/where/else/foo' - -'file:'.__DIR__.'/profiler' diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/composer.json b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/composer.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/composer.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php index 3eb765d2b5..21583ad40a 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php @@ -16,11 +16,6 @@ use Symfony\Component\Config\Loader\LoaderInterface; class KernelForTest extends Kernel { - public function setRootDir($dir) - { - $this->rootDir = $dir; - } - public function getBundleMap() { return $this->bundleMap; diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php index 95e8942d08..a19bc32679 100644 --- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php @@ -824,34 +824,6 @@ EOF; $kernel->terminate(Request::create('/'), new Response()); } - public function testRemoveAbsolutePathsFromContainer() - { - $kernel = new KernelForTest('dev', true); - $kernel->setRootDir($symfonyRootDir = __DIR__.'/Fixtures/DumpedContainers/app'); - - $content = file_get_contents($symfonyRootDir.'/cache/dev/withAbsolutePaths.php'); - $content = str_replace('ROOT_DIR', __DIR__.'/Fixtures/DumpedContainers', $content); - - $m = new \ReflectionMethod($kernel, 'removeAbsolutePathsFromContainer'); - $m->setAccessible(true); - $content = $m->invoke($kernel, $content); - $this->assertEquals(file_get_contents($symfonyRootDir.'/cache/dev/withoutAbsolutePaths.php'), $content); - } - - public function testRemoveAbsolutePathsFromContainerGiveUpWhenComposerJsonPathNotGuessable() - { - $kernel = new KernelForTest('dev', true); - $kernel->setRootDir($symfonyRootDir = sys_get_temp_dir()); - - $content = file_get_contents(__DIR__.'/Fixtures/DumpedContainers/app/cache/dev/withAbsolutePaths.php'); - $content = str_replace('ROOT_DIR', __DIR__.'/Fixtures/DumpedContainers', $content); - - $m = new \ReflectionMethod($kernel, 'removeAbsolutePathsFromContainer'); - $m->setAccessible(true); - $newContent = $m->invoke($kernel, $content); - $this->assertEquals($newContent, $content); - } - protected function getBundle($dir = null, $parent = null, $className = null, $bundleName = null) { $bundle = $this diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 9b52591d9f..af659da904 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -29,7 +29,6 @@ "symfony/console": "~2.2", "symfony/dependency-injection": "~2.0", "symfony/finder": "~2.0", - "symfony/filesystem": "~2.4", "symfony/process": "~2.0", "symfony/routing": "~2.2", "symfony/stopwatch": "~2.2", @@ -41,8 +40,7 @@ "symfony/config": "", "symfony/console": "", "symfony/dependency-injection": "", - "symfony/finder": "", - "symfony/filesystem": "" + "symfony/finder": "" }, "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel\\": "" }