Fix "absolute path" when we look to the cache directory

BenoitLeveque · fabpot · commit 4735e56c44ea · 2014-05-18T17:35:30.000+02:00
We should get __DIR__ instead of __DIR__ . '/.'
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -748,9 +748,15 @@ private function removeAbsolutePathsFromContainer($content)
         $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), '/')."'";
+            $relativePath = rtrim($filesystem->makePathRelative($match[2], $cacheDir), '/');
+
+            if ($relativePath === '.') {
+                return $prefix;
+            }
+
+            return $prefix . ".'/" . $relativePath . "'";
         }, $content);
     }
 
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
@@ -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'
 
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
@@ -1,6 +1,7 @@
 __DIR__.'/foo'
 __DIR__.'/../foo'
 __DIR__.'/../../../foo/bar.php'
+__DIR__
 
 '/some/where/else/foo'
 
