From ca3c5e652ed5278a1ab8366ed181b04c0cb662f6 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 5 May 2011 08:46:04 +0200
Subject: [PATCH] moved ErrorHandler management to the distributions

---
 UPDATE.md                                             |  3 +++
 .../AsseticBundle/Tests/Resources/config/config.yml   |  1 -
 .../DependencyInjection/Configuration.php             |  1 -
 .../DependencyInjection/FrameworkExtension.php        | 11 -----------
 .../Bundle/FrameworkBundle/FrameworkBundle.php        | 10 ----------
 .../FrameworkBundle/Resources/config/services.xml     |  5 -----
 6 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/UPDATE.md b/UPDATE.md
index 9d8025f861..50aa75260b 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -9,6 +9,9 @@ timeline closely anyway.
 beta1 to beta2
 --------------
 
+* The ``error_handler`` setting has been removed. The ``ErrorHandler`` class
+  is now managed directly by Symfony SE in ``AppKernel``.
+
 * The Doctrine metadata files has moved from
   ``Resources/config/doctrine/metadata/orm/`` to ``Resources/config/`` and the
   extension from ``.dcm.yml`` to ``.orm.dcm.yml``
diff --git a/src/Symfony/Bundle/AsseticBundle/Tests/Resources/config/config.yml b/src/Symfony/Bundle/AsseticBundle/Tests/Resources/config/config.yml
index e0521cbf73..2ec6299560 100644
--- a/src/Symfony/Bundle/AsseticBundle/Tests/Resources/config/config.yml
+++ b/src/Symfony/Bundle/AsseticBundle/Tests/Resources/config/config.yml
@@ -1,6 +1,5 @@
 framework:
     charset:       UTF-8
-    error_handler: null
     secret: xxxxxxxxxx
     csrf_protection:
         enabled: true
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 647043c514..fab0524788 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -40,7 +40,6 @@ class Configuration implements ConfigurationInterface
                 ->scalarNode('cache_warmer')->defaultValue(!$this->debug)->end()
                 ->scalarNode('charset')->end()
                 ->scalarNode('secret')->isRequired()->end()
-                ->scalarNode('error_handler')->end()
                 ->scalarNode('exception_controller')->defaultValue('Symfony\\Bundle\\FrameworkBundle\\Controller\\ExceptionController::showAction')->end()
                 ->scalarNode('ide')->defaultNull()->end()
                 ->booleanNode('test')->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 954fc8d413..2e3908f5eb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -67,17 +67,6 @@ class FrameworkExtension extends Extension
 
         $container->setParameter('kernel.secret', $config['secret']);
 
-        if (isset($config['error_handler'])) {
-            if (false === $config['error_handler']) {
-                $container->getDefinition('error_handler')->setMethodCalls(array());
-            } else {
-                $container
-                    ->getDefinition('error_handler')->addMethodCall('register', array())
-                    ->replaceArgument(0, $config['error_handler'])
-                ;
-            }
-        }
-
         $container->getDefinition('exception_listener')->replaceArgument(0, $config['exception_controller']);
 
         if (!empty($config['test'])) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index 62a7b2650c..fd0e53cda0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -34,16 +34,6 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
  */
 class FrameworkBundle extends Bundle
 {
-    /**
-     * Boots the Bundle.
-     */
-    public function boot()
-    {
-        if ($this->container->has('error_handler')) {
-            $this->container->get('error_handler');
-        }
-    }
-
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
index 84423f66bc..73b2b471e2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -7,7 +7,6 @@
     <parameters>
         <parameter key="event_dispatcher.class">Symfony\Bundle\FrameworkBundle\ContainerAwareEventDispatcher</parameter>
         <parameter key="http_kernel.class">Symfony\Bundle\FrameworkBundle\HttpKernel</parameter>
-        <parameter key="error_handler.class">Symfony\Component\HttpKernel\Debug\ErrorHandler</parameter>
         <parameter key="filesystem.class">Symfony\Component\HttpKernel\Util\Filesystem</parameter>
         <parameter key="cache_warmer.class">Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate</parameter>
         <parameter key="file_locator.class">Symfony\Component\HttpKernel\Config\FileLocator</parameter>
@@ -18,10 +17,6 @@
             <argument type="service" id="service_container" />
         </service>
 
-        <service id="error_handler" class="%error_handler.class%">
-            <argument /> <!-- level (null by default) -->
-        </service>
-
         <service id="http_kernel" class="%http_kernel.class%">
             <argument type="service" id="event_dispatcher" />
             <argument type="service" id="service_container" />