[Form] [FrameworkBundle] catch deprecation errors in tests

symfony · Dec 14, 2012 · ebcb432 · ebcb432
1 parent c21b12e
commit ebcb432
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -68,6 +68,8 @@ protected function getExtensions()
     protected function tearDown()
     {
         $this->engine = null;
+
+        parent::tearDown();
     }
 
     protected function renderEnctype(FormView $view)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -69,6 +69,8 @@ protected function getExtensions()
     protected function tearDown()
     {
         $this->engine = null;
+
+        parent::tearDown();
     }
 
     protected function renderEnctype(FormView $view)

diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -45,6 +45,8 @@ protected function tearDown()
     {
         $this->csrfProvider = null;
         $this->factory = null;
+
+        parent::tearDown();
     }
 
     protected function assertXpathNodeValue(\DomElement $element, $expression, $nodeValue)

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TypeTestCase.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TypeTestCase.php
@@ -33,14 +33,6 @@ protected function setUp()
 
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);
-
-        set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
-
-    }
-
-    protected function tearDown()
-    {
-        restore_error_handler();
     }
 
     public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)

diff --git a/src/Symfony/Component/Form/Tests/FormIntegrationTestCase.php b/src/Symfony/Component/Form/Tests/FormIntegrationTestCase.php
@@ -32,6 +32,13 @@ protected function setUp()
         $this->factory = Forms::createFormFactoryBuilder()
             ->addExtensions($this->getExtensions())
             ->getFormFactory();
+
+        set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
+    }
+
+    protected function tearDown()
+    {
+        restore_error_handler();
     }
 
     protected function getExtensions()