Merge branch '2.7' into 2.8

* 2.7:
  [minor] SCA

Author: nicolas-grekas

CacheWarmer/TemplateFinder.php

@@ -97,11 +97,10 @@ private function findTemplatesInFolder($dir)
     private function findTemplatesInBundle(BundleInterface $bundle)
     {
         $name = $bundle->getName();
-        $templates = array_merge(
+        $templates = array_unique(array_merge(
             $this->findTemplatesInFolder($bundle->getPath().'/Resources/views'),
             $this->findTemplatesInFolder($this->rootDir.'/'.$name.'/views')
-        );
-        $templates = array_unique($templates);
+        ));
 
         foreach ($templates as $i => $template) {
             $templates[$i] = $template->set('bundle', $name);

Templating/Helper/CodeHelper.php

@@ -160,7 +160,7 @@ public function formatFile($file, $line, $text = null)
             $file = trim($file);
             $fileStr = $file;
             if (0 === strpos($fileStr, $this->rootDir)) {
-                $fileStr = str_replace($this->rootDir, '', str_replace('\\', '/', $fileStr));
+                $fileStr = str_replace(array('\\', $this->rootDir), array('/', ''), $fileStr);
                 $fileStr = htmlspecialchars($fileStr, $flags, $this->charset);
                 $fileStr = sprintf('<abbr title="%s">kernel.root_dir</abbr>/%s', htmlspecialchars($this->rootDir, $flags, $this->charset), $fileStr);
             }