From 96045739b198b030ab159425ce19614fe2e0e665 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 11 Jun 2011 07:50:14 +0200
Subject: [PATCH] [TwigBundle] removed the extensions setting

---
 UPDATE.md                                           |  3 +++
 .../DependencyInjection/Configuration.php           | 13 -------------
 .../DependencyInjection/TwigExtension.php           |  6 ------
 .../Bundle/TwigBundle/Resources/config/twig.xml     |  6 ------
 .../Tests/DependencyInjection/TwigExtensionTest.php |  6 ------
 .../Component/Form/Extension/Core/Type/FileType.php |  2 +-
 6 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/UPDATE.md b/UPDATE.md
index 66bb974e73..906b62ed1e 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -9,6 +9,9 @@ timeline closely anyway.
 beta4 to beta5
 --------------
 
+* The `extensions` setting for Twig has been removed. There is now only one
+  way to register Twig extensions, via the `twig.extension` tag.
+
 * The stack of Monolog handlers now bubbles the records by default. To stop
   the propagation you need to configure the bubbling explicitly.
 
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
index 10da1a88f0..97ddab1fbe 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -32,7 +32,6 @@ class Configuration implements ConfigurationInterface
         $treeBuilder = new TreeBuilder();
         $rootNode = $treeBuilder->root('twig');
 
-        $this->addExtensionsSection($rootNode);
         $this->addFormSection($rootNode);
         $this->addGlobalsSection($rootNode);
         $this->addTwigOptions($rootNode);
@@ -40,18 +39,6 @@ class Configuration implements ConfigurationInterface
         return $treeBuilder;
     }
 
-    private function addExtensionsSection(ArrayNodeDefinition $rootNode)
-    {
-        $rootNode
-            ->fixXmlConfig('extension')
-            ->children()
-                ->arrayNode('extensions')
-                    ->prototype('scalar')->end()
-                ->end()
-            ->end()
-        ;
-    }
-
     private function addFormSection(ArrayNodeDefinition $rootNode)
     {
         $rootNode
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index 432ee4f9fe..bfbd6d5df2 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -55,12 +55,6 @@ class TwigExtension extends Extension
             }
         }
 
-        if (!empty($config['extensions'])) {
-            foreach ($config['extensions'] as $id) {
-                $container->getDefinition($id)->addTag('twig.extension');
-            }
-        }
-
         unset(
             $config['form'],
             $config['globals'],
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 178c5b8590..dcf057f283 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -16,8 +16,6 @@
         <parameter key="twig.extension.routing.class">Symfony\Bridge\Twig\Extension\RoutingExtension</parameter>
         <parameter key="twig.extension.yaml.class">Symfony\Bridge\Twig\Extension\YamlExtension</parameter>
         <parameter key="twig.extension.form.class">Symfony\Bridge\Twig\Extension\FormExtension</parameter>
-        <parameter key="twig.extension.text.class">Twig_Extensions_Extension_Text</parameter>
-        <parameter key="twig.extension.debug.class">Twig_Extensions_Extension_Debug</parameter>
     </parameters>
 
     <services>
@@ -76,9 +74,5 @@
             <tag name="twig.extension" />
             <argument>%twig.form.resources%</argument>
         </service>
-
-        <service id="twig.extension.text" class="%twig.extension.text.class%" public="false" />
-
-        <service id="twig.extension.debug" class="%twig.extension.debug.class%" public="false" />
     </services>
 </container>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
index 999afb0c2f..85f5c31120 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -52,12 +52,6 @@ class TwigExtensionTest extends TestCase
 
         $this->assertEquals('Twig_Environment', $container->getParameter('twig.class'), '->load() loads the twig.xml file');
 
-        // Extensions
-        foreach (array('twig.extension.debug', 'twig.extension.text') as $id) {
-            $config = $container->getDefinition($id);
-            $this->assertEquals(array('twig.extension'), array_keys($config->getTags()), '->load() adds tags to extension definitions');
-        }
-
         // Form resources
         $resources = $container->getParameter('twig.form.resources');
         $this->assertContains('div_layout.html.twig', $resources, '->load() includes default template for form resources');
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index 3be1b771d5..fa7af5fb3f 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -48,7 +48,7 @@ class FileType extends AbstractType
     public function getDefaultOptions(array $options)
     {
         return array(
-            'type' => 'file',
+            'type' => 'string',
         );
     }