From 45bd4135ecefaa17f484abb58fbcbdadd0a18f4e Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 1 Mar 2013 11:25:47 +0100
Subject: [PATCH] [FrameworkBundle] removed deprecated options

---
 .../DependencyInjection/Configuration.php     | 27 -------------------
 .../Resources/config/schema/symfony-1.0.xsd   |  5 ----
 .../DependencyInjection/ConfigurationTest.php |  1 -
 3 files changed, 33 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 40bbbab943..d0287cba97 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -26,8 +26,6 @@ class Configuration implements ConfigurationInterface
      * Generates the configuration tree builder.
      *
      * @return TreeBuilder The tree builder
-     *
-     * @throws \RuntimeException When using the deprecated 'charset' setting
      */
     public function getConfigTreeBuilder()
     {
@@ -36,21 +34,6 @@ class Configuration implements ConfigurationInterface
 
         $rootNode
             ->children()
-                ->scalarNode('charset')
-                    ->defaultNull()
-                    ->beforeNormalization()
-                        ->ifTrue(function($v) { return null !== $v; })
-                        ->then(function($v) {
-                            $message = 'The charset setting is deprecated. Just remove it from your configuration file.';
-
-                            if ('UTF-8' !== $v) {
-                                $message .= sprintf('You need to define a getCharset() method in your Application Kernel class that returns "%s".', $v);
-                            }
-
-                            throw new \RuntimeException($message);
-                        })
-                    ->end()
-                ->end()
                 ->scalarNode('secret')->end()
                 ->scalarNode('http_method_override')
                     ->info("Set true to enable support for the '_method' request parameter to determine the intended HTTP method on POST requests.")
@@ -200,16 +183,6 @@ class Configuration implements ConfigurationInterface
                     ->info('session configuration')
                     ->canBeUnset()
                     ->children()
-                        ->booleanNode('auto_start')
-                            ->info('DEPRECATED! Session starts on demand')
-                            ->defaultFalse()
-                            ->beforeNormalization()
-                                ->ifTrue(function($v) { return null !== $v; })
-                                ->then(function($v) {
-                                    throw new \RuntimeException('The auto_start setting is deprecated. Just remove it from your configuration file.');
-                                })
-                            ->end()
-                        ->end()
                         ->scalarNode('storage_id')->defaultValue('session.storage.native')->end()
                         ->scalarNode('handler_id')->defaultValue('session.handler.native_file')->end()
                         ->scalarNode('name')->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
index 79bba7a6cb..675a24b2c6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -22,8 +22,6 @@
             <xsd:element name="annotations" type="annotations" minOccurs="0" maxOccurs="1" />
         </xsd:all>
 
-        <!-- charset is deprecated and will be removed in 2.2 -->
-        <xsd:attribute name="charset" type="xsd:string" />
         <xsd:attribute name="http-method-override" type="xsd:boolean" />
         <xsd:attribute name="trusted-proxies" type="xsd:string" />
         <xsd:attribute name="ide" type="xsd:string" />
@@ -87,9 +85,6 @@
         <xsd:attribute name="cookie-domain" type="xsd:string" />
         <xsd:attribute name="cookie-secure" type="xsd:boolean" />
         <xsd:attribute name="cookie-httponly" type="xsd:boolean" />
-        <!-- deprecated attributes -->
-        <xsd:attribute name="auto-start" type="xsd:boolean" />
-        <!-- end of deprecated attributes -->
         <xsd:attribute name="cache-limiter" type="xsd:string" />
         <xsd:attribute name="gc-maxlifetime" type="xsd:string" />
         <xsd:attribute name="gc-divisor" type="xsd:string" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index 3acdddd242..39a2e58ca3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -87,7 +87,6 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
     protected static function getBundleDefaultConfig()
     {
         return array(
-            'charset'             => null,
             'http_method_override' => true,
             'trusted_proxies'     => array(),
             'ide'                 => null,