Make rootPath part of regex greedy

- Fixes #10977
symfony · May 26, 2014 · 31da839 · 31da839
1 parent 168174a
commit 31da839
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 12 deletions.
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -53,6 +53,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $bundleMap;
     protected $container;
     protected $rootDir;
+    protected $realRootDir;
     protected $environment;
     protected $debug;
     protected $booted;
@@ -731,24 +732,17 @@ private function removeAbsolutePathsFromContainer($content)
             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 = $this->getRealRootDir();
+        if (!$rootDir) {
+            return $content;
         }
 
         $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 preg_replace_callback("{'([^']*?)(".preg_quote($rootDir)."[^']*)'}", function ($match) use ($filesystem, $cacheDir) {
+            $prefix = !empty($match[1]) ? "'$match[1]'.__DIR__" : "__DIR__";
 
             if ('.' === $relativePath = rtrim($filesystem->makePathRelative($match[2], $cacheDir), '/')) {
                 return $prefix;
@@ -758,6 +752,33 @@ private function removeAbsolutePathsFromContainer($content)
         }, $content);
     }
 
+    /**
+     * Find the "real" root dir (by finding the composer.json file)
+     *
+     * @return null|string
+     */
+    private function getRealRootDir()
+    {
+        if (null !== $this->realRootDir) {
+            return $this->realRootDir;
+        }
+
+        $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 $this->realRootDir = false;
+            }
+
+            $previous = $rootDir;
+        }
+
+        $this->realRootDir = $rootDir;
+
+        return $this->realRootDir;
+    }
+
     /**
      * Returns a loader for the container.
      *

diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
@@ -56,4 +56,9 @@ public function setIsBooted($value)
     {
         $this->booted = (bool) $value;
     }
+
+    public function setRealRootDir($dir)
+    {
+        $this->realRootDir = $dir;
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -852,6 +852,27 @@ public function testRemoveAbsolutePathsFromContainerGiveUpWhenComposerJsonPathNo
         $this->assertEquals($newContent, $content);
     }
 
+    public function testRemoveAbsolutePathsFromContainerWithSpecialCase()
+    {
+        $kernel = new KernelForTest('dev', true);
+        $kernel->setRootDir('/app/app');
+        $kernel->setRealRootDir('/app');
+        $symfonyRootDir = __DIR__.'/Fixtures/DumpedContainers/app';
+
+        $content = file_get_contents($symfonyRootDir.'/cache/dev/withAbsolutePaths.php');
+        $content = str_replace('ROOT_DIR', '/app', $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);
+    }
+
+    /**
+     * Returns a mock for the BundleInterface
+     *
+     * @return BundleInterface
+     */
     protected function getBundle($dir = null, $parent = null, $className = null, $bundleName = null)
     {
         $bundle = $this