From 01b71a47ead348491b6ea052be48a9c6b5c0ec47 Mon Sep 17 00:00:00 2001
From: Bernhard Schussek <bschussek@gmail.com>
Date: Mon, 15 Apr 2013 11:15:47 +0200
Subject: [PATCH] [Form] Removed trigger_error() for deprecations as of 3.0

---
 src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php         | 4 +++-
 .../FrameworkBundle/Templating/Helper/FormHelper.php     | 3 ++-
 .../HttpFoundation/EventListener/BindRequestListener.php | 3 ++-
 .../Component/Form/Tests/FormIntegrationTestCase.php     | 9 ---------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php b/src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php
index 73c1b7748e..93bce1b9e6 100644
--- a/src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php
+++ b/src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php
@@ -24,6 +24,8 @@ class FormEnctypeNode extends SearchAndRenderBlockNode
         parent::compile($compiler);
 
         $compiler->raw(";\n");
-        $compiler->write('trigger_error(\'The helper form_enctype(form) is deprecated since version 2.3 and will be removed in 3.0. Use form_start(form) instead.\', E_USER_DEPRECATED)');
+
+        // Uncomment this as soon as the deprecation note should be shown
+        // $compiler->write('trigger_error(\'The helper form_enctype(form) is deprecated since version 2.3 and will be removed in 3.0. Use form_start(form) instead.\', E_USER_DEPRECATED)');
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
index 6329653a47..29220af5ab 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -136,7 +136,8 @@ class FormHelper extends Helper
      */
     public function enctype(FormView $view)
     {
-        trigger_error('The form helper $view[\'form\']->enctype() is deprecated since version 2.3 and will be removed in 3.0. Use $view[\'form\']->start() instead.', E_USER_DEPRECATED);
+        // Uncomment this as soon as the deprecation note should be shown
+        // trigger_error('The form helper $view[\'form\']->enctype() is deprecated since version 2.3 and will be removed in 3.0. Use $view[\'form\']->start() instead.', E_USER_DEPRECATED);
 
         return $this->renderer->searchAndRenderBlock($view, 'enctype');
     }
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php b/src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
index 1eb4e6f297..3b4359ed5c 100644
--- a/src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
+++ b/src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
@@ -43,7 +43,8 @@ class BindRequestListener implements EventSubscriberInterface
             return;
         }
 
-        trigger_error('Passing a Request instance to Form::bind() is deprecated since version 2.3 and will be disabled in 3.0. Call Form::process($request) instead.', E_USER_DEPRECATED);
+        // Uncomment this as soon as the deprecation note should be shown
+        // trigger_error('Passing a Request instance to Form::bind() is deprecated since version 2.3 and will be disabled in 3.0. Call Form::process($request) instead.', E_USER_DEPRECATED);
 
         $name = $form->getConfig()->getName();
         $default = $form->getConfig()->getCompound() ? array() : null;
diff --git a/src/Symfony/Component/Form/Tests/FormIntegrationTestCase.php b/src/Symfony/Component/Form/Tests/FormIntegrationTestCase.php
index e72ec4723b..536ff4c824 100644
--- a/src/Symfony/Component/Form/Tests/FormIntegrationTestCase.php
+++ b/src/Symfony/Component/Form/Tests/FormIntegrationTestCase.php
@@ -32,15 +32,6 @@ abstract class FormIntegrationTestCase extends \PHPUnit_Framework_TestCase
         $this->factory = Forms::createFormFactoryBuilder()
             ->addExtensions($this->getExtensions())
             ->getFormFactory();
-
-        set_error_handler(array('Symfony\Component\Form\Test\DeprecationErrorHandler', 'handle'));
-    }
-
-    protected function tearDown()
-    {
-        $this->factory = null;
-
-        restore_error_handler();
     }
 
     protected function getExtensions()