Merge branch '2.3' into 2.7

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Templating/TemplateFilenameParser.php

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -423,7 +423,7 @@ class Configuration implements ConfigurationInterface
                                     ->addDefaultChildrenIfNoneSet()
                                     ->prototype('scalar')->defaultValue('FrameworkBundle:Form')->end()
                                     ->validate()
-                                        ->ifNotInArray(array('FrameworkBundle:Form'))
+                                        ->ifTrue(function ($v) {return !in_array('FrameworkBundle:Form', $v); })
                                         ->then(function ($v) {
                                             return array_merge(array('FrameworkBundle:Form'), $v);
                                         })

src/Symfony/Bundle/FrameworkBundle/Templating/TemplateFilenameParser.php

@@ -31,7 +31,7 @@ class TemplateFilenameParser implements TemplateNameParserInterface
             return $name;
         }
 
-        $parts = explode('/', strtr($name, '\\', '/'));
+        $parts = explode('/', str_replace('\\', '/', $name));
 
         $elements = explode('.', array_pop($parts));
         if (3 > count($elements)) {

src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php

@@ -49,7 +49,7 @@ class TemplateNameParser extends BaseTemplateNameParser
         }
 
         // normalize name
-        $name = str_replace(':/', ':', preg_replace('#/{2,}#', '/', strtr($name, '\\', '/')));
+        $name = str_replace(':/', ':', preg_replace('#/{2,}#', '/', str_replace('\\', '/', $name)));
 
         if (false !== strpos($name, '..')) {
             throw new \RuntimeException(sprintf('Template name "%s" contains invalid characters.', $name));

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

@@ -27,6 +27,19 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
         );
     }
 
+    public function testDoNoDuplicateDefaultFormResources()
+    {
+        $input = array('templating' => array(
+            'form' => array('resources' => array('FrameworkBundle:Form')),
+            'engines' => array('php'),
+        ));
+
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(), array($input));
+
+        $this->assertEquals(array('FrameworkBundle:Form'), $config['templating']['form']['resources']);
+    }
+
     /**
      * @dataProvider getTestValidTrustedProxiesData
      */

src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php

@@ -81,7 +81,7 @@ class Configuration implements ConfigurationInterface
                             ->prototype('scalar')->defaultValue('form_div_layout.html.twig')->end()
                             ->example(array('MyBundle::form.html.twig'))
                             ->validate()
-                                ->ifNotInArray(array('form_div_layout.html.twig'))
+                                ->ifTrue(function ($v) {return !in_array('form_div_layout.html.twig', $v); })
                                 ->then(function ($v) {
                                     return array_merge(array('form_div_layout.html.twig'), $v);
                                 })

src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/ConfigurationTest.php

@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection;
+
+use Symfony\Bundle\TwigBundle\DependencyInjection\Configuration;
+use Symfony\Component\Config\Definition\Processor;
+
+class ConfigurationTest extends \PHPUnit_Framework_TestCase
+{
+    public function testDoNoDuplicateDefaultFormResources()
+    {
+        $input = array(
+            'form' => array('resources' => array('form_div_layout.html.twig')),
+        );
+
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(), array($input));
+
+        $this->assertEquals(array('form_div_layout.html.twig'), $config['form']['resources']);
+    }
+}

src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php

@@ -140,10 +140,10 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
     protected function assertEqualsNormalized($expected, $actual, $message = null)
     {
         foreach ($expected as $ns => $path) {
-            $expected[$ns] = strtr($path, '\\', '/');
+            $expected[$ns] = str_replace('\\', '/', $path);
         }
         foreach ($actual as $ns => $path) {
-            $actual[$ns] = strtr($path, '\\', '/');
+            $actual[$ns] = str_replace('\\', '/', $path);
         }
         $this->assertEquals($expected, $actual, $message);
     }

src/Symfony/Component/Filesystem/Filesystem.php

@@ -329,8 +329,8 @@ class Filesystem
     {
         // Normalize separators on Windows
         if ('\\' === DIRECTORY_SEPARATOR) {
-            $endPath = strtr($endPath, '\\', '/');
-            $startPath = strtr($startPath, '\\', '/');
+            $endPath = str_replace('\\', '/', $endPath);
+            $startPath = str_replace('\\', '/', $startPath);
         }
 
         // Split the paths into arrays

src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php

@@ -43,7 +43,7 @@ class ExcludeDirectoryFilterIterator extends FilterIterator
     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;

src/Symfony/Component/Finder/Iterator/PathFilterIterator.php

@@ -29,7 +29,7 @@ class PathFilterIterator extends MultiplePcreFilterIterator
         $filename = $this->current()->getRelativePathname();
 
         if ('\\' === DIRECTORY_SEPARATOR) {
-            $filename = strtr($filename, '\\', '/');
+            $filename = str_replace('\\', '/', $filename);
         }
 
         // should at least not match one rule to exclude