[Form] Starting to bring back resouces as configurable

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

@@ -64,11 +64,11 @@ class Configuration implements ConfigurationInterface
                     ->children()
                         ->arrayNode('resources')
                             ->addDefaultsIfNotSet()
-                            ->defaultValue(array('TwigBundle::form.html.twig'))
+                            ->defaultValue(array('TwigBundle:Form:div_layout.html.twig'))
                             ->validate()
                                 ->always()
                                 ->then(function($v){
-                                    return array_merge(array('TwigBundle::form.html.twig'), $v);
+                                    return array_merge(array('TwigBundle:Form:div_layout.html.twig'), $v);
                                 })
                             ->end()
                             ->prototype('scalar')->end()

src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

@@ -54,9 +54,7 @@
 
         <service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
             <tag name="twig.extension" />
-            <argument type="collection">
-                <argument>TwigBundle:Form:div_layout.html.twig</argument>
-            </argument>
+            <argument>%twig.form.resources%</argument>
         </service>
 
         <service id="twig.extension.text" class="Twig_Extensions_Extension_Text" public="false" />

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

@@ -65,7 +65,7 @@ class TwigExtensionTest extends TestCase
 
         // Form resources
         $resources = $container->getParameter('twig.form.resources');
-        $this->assertContains('TwigBundle::form.html.twig', $resources, '->load() includes default template for form resources');
+        $this->assertContains('TwigBundle:Form:div_layout.html.twig', $resources, '->load() includes default template for form resources');
         $this->assertContains('MyBundle::form.html.twig', $resources, '->load() merges new templates into form resources');
 
         // Globals