[FrameworkBundle] Fixed cache clear command with relative file refs

1ed · 1ed · commit 0017be5d7ce6 · 2014-12-09T14:37:24.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -150,10 +150,10 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr
         }
 
         // fix references to cached files with the real cache directory name
-        $search = array($warmupDir, str_replace('\\', '\\\\', $warmupDir));
-        $replace = str_replace('\\', '/', $realCacheDir);
+        $search = sprintf('/(dirname\(.+?)(%s)/', preg_quote(basename($warmupDir)));
+        $replace = sprintf('$1%s', preg_quote(basename($realCacheDir)));
         foreach (Finder::create()->files()->in($warmupDir) as $file) {
-            $content = str_replace($search, $replace, file_get_contents($file));
+            $content = preg_replace($search, $replace, file_get_contents($file));
             file_put_contents($file, $content);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -150,10 +150,10 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`// fix references to cached files with the real cache directory name`
`153`		`- $search = array($warmupDir, str_replace('\\', '\\\\', $warmupDir));`
`154`		`- $replace = str_replace('\\', '/', $realCacheDir);`
	`153`	`+ $search = sprintf('/(dirname\(.+?)(%s)/', preg_quote(basename($warmupDir)));`
	`154`	`+ $replace = sprintf('$1%s', preg_quote(basename($realCacheDir)));`
`155`	`155`	`foreach (Finder::create()->files()->in($warmupDir) as $file) {`
`156`		`- $content = str_replace($search, $replace, file_get_contents($file));`
	`156`	`+ $content = preg_replace($search, $replace, file_get_contents($file));`
`157`	`157`	`file_put_contents($file, $content);`
`158`	`158`	`}`
`159`	`159`