Merge branch '2.3' into 2.7

Tobion · Tobion · commit fff4b0c36264 · 2015-08-26T19:56:37.000+02:00
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Templating/TemplateFilenameParser.php
diff --git a/Iterator/ExcludeDirectoryFilterIterator.php b/Iterator/ExcludeDirectoryFilterIterator.php
@@ -43,7 +43,7 @@ public function __construct(\Iterator $iterator, array $directories)
     public function accept()
     {
         $path = $this->isDir() ? $this->current()->getRelativePathname() : $this->current()->getRelativePath();
-        $path = strtr($path, '\\', '/');
+        $path = str_replace('\\', '/', $path);
         foreach ($this->patterns as $pattern) {
             if (preg_match($pattern, $path)) {
                 return false;
diff --git a/Iterator/PathFilterIterator.php b/Iterator/PathFilterIterator.php
@@ -29,7 +29,7 @@ public function accept()
         $filename = $this->current()->getRelativePathname();
 
         if ('\\' === DIRECTORY_SEPARATOR) {
-            $filename = strtr($filename, '\\', '/');
+            $filename = str_replace('\\', '/', $filename);
         }
 
         // should at least not match one rule to exclude

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(\Iterator $iterator, array $directories)`
`43`	`43`	`public function accept()`
`44`	`44`	`{`
`45`	`45`	`$path = $this->isDir() ? $this->current()->getRelativePathname() : $this->current()->getRelativePath();`
`46`		`- $path = strtr($path, '\\', '/');`
	`46`	`+ $path = str_replace('\\', '/', $path);`
`47`	`47`	`foreach ($this->patterns as $pattern) {`
`48`	`48`	`if (preg_match($pattern, $path)) {`
`49`	`49`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function accept()`
`29`	`29`	`$filename = $this->current()->getRelativePathname();`
`30`	`30`
`31`	`31`	`if ('\\' === DIRECTORY_SEPARATOR) {`
`32`		`- $filename = strtr($filename, '\\', '/');`
	`32`	`+ $filename = str_replace('\\', '/', $filename);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// should at least not match one rule to exclude`