Merge branch '2.4' into 2.5

* 2.4:
  Remove Spaceless Blocks From Twig Templates
  Validate locales sets intos translator
  Fix UserPassword validator translation
  Remove Spaceless Blocks from Twig Form Templates
  fixed typo
  [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671)
  added regression test
  fix issue #8171 on configuration tree for twig extension -- pairing up with @cordoval
  [HttpFoundation] Fix wrong assertion in Response test
  [Upgrade] Fixed markdown syntax
  [2.3][Form] Cleanup & fix phpdocs
  Added verbosity methods

Conflicts:
	src/Symfony/Component/Form/FormError.php

Author: fabpot

DependencyInjection/Configuration.php

@@ -136,6 +136,7 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode)
                 ->scalarNode('optimizations')->end()
                 ->arrayNode('paths')
                     ->normalizeKeys(false)
+                    ->useAttributeAsKey('paths')
                     ->beforeNormalization()
                         ->always()
                         ->then(function ($paths) {

Tests/DependencyInjection/Fixtures/php/extra.php

@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('twig', array(
+     'paths'               => array(
+         'namespaced_path3' => 'namespace3',
+      ),
+));

Tests/DependencyInjection/Fixtures/php/full.php

@@ -22,7 +22,7 @@
      'paths'               => array(
          'path1',
          'path2',
-         'namespaced_path1' => 'namespace',
-         'namespaced_path2' => 'namespace',
+         'namespaced_path1' => 'namespace1',
+         'namespaced_path2' => 'namespace2',
       ),
 ));

Tests/DependencyInjection/Fixtures/xml/extra.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:twig="http://symfony.com/schema/dic/twig"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+    <twig:config auto-reload="true" autoescape="true" base-template-class="stdClass" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true">
+        <twig:path namespace="namespace3">namespaced_path3</twig:path>
+    </twig:config>
+</container>

Tests/DependencyInjection/Fixtures/xml/full.xml

@@ -15,7 +15,7 @@
         <twig:global key="pi">3.14</twig:global>
         <twig:path>path1</twig:path>
         <twig:path>path2</twig:path>
-        <twig:path namespace="namespace">namespaced_path1</twig:path>
-        <twig:path namespace="namespace">namespaced_path2</twig:path>
+        <twig:path namespace="namespace1">namespaced_path1</twig:path>
+        <twig:path namespace="namespace2">namespaced_path2</twig:path>
     </twig:config>
 </container>

Tests/DependencyInjection/Fixtures/yml/extra.yml

@@ -0,0 +1,3 @@
+twig:
+    paths:
+        namespaced_path3: namespace3

Tests/DependencyInjection/Fixtures/yml/full.yml

@@ -17,5 +17,5 @@ twig:
     paths:
         path1: ''
         path2: ''
-        namespaced_path1: namespace
-        namespaced_path2: namespace
+        namespaced_path1: namespace1
+        namespaced_path2: namespace2

Tests/DependencyInjection/TwigExtensionTest.php

@@ -145,6 +145,7 @@ public function testTwigLoaderPaths($format)
         $container = $this->createContainer();
         $container->registerExtension(new TwigExtension());
         $this->loadFromFile($container, 'full', $format);
+        $this->loadFromFile($container, 'extra', $format);
         $this->compileContainer($container);
 
         $def = $container->getDefinition('twig.loader.filesystem');
@@ -160,8 +161,9 @@ public function testTwigLoaderPaths($format)
         $this->assertEquals(array(
             array('path1'),
             array('path2'),
-            array('namespaced_path1', 'namespace'),
-            array('namespaced_path2', 'namespace'),
+            array('namespaced_path1', 'namespace1'),
+            array('namespaced_path2', 'namespace2'),
+            array('namespaced_path3', 'namespace3'),
             array(__DIR__.'/Fixtures/Resources/TwigBundle/views', 'Twig'),
             array(realpath(__DIR__.'/../..').'/Resources/views', 'Twig'),
             array(__DIR__.'/Fixtures/Resources/views'),