From ebcb432f072e2a9ae5d3cdb66cb1bf1e81065860 Mon Sep 17 00:00:00 2001 From: Colin Frei Date: Fri, 14 Dec 2012 23:16:06 +0100 Subject: [PATCH] [Form] [FrameworkBundle] catch deprecation errors in tests --- .../Tests/Templating/Helper/FormHelperDivLayoutTest.php | 2 ++ .../Tests/Templating/Helper/FormHelperTableLayoutTest.php | 2 ++ src/Symfony/Component/Form/Tests/AbstractLayoutTest.php | 2 ++ .../Form/Tests/Extension/Core/Type/TypeTestCase.php | 8 -------- .../Component/Form/Tests/FormIntegrationTestCase.php | 7 +++++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php index 9c077f39da..7382ab8782 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @@ -68,6 +68,8 @@ class FormHelperDivLayoutTest extends AbstractDivLayoutTest 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 index 1f5292bc7e..f5f0fe0d6b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php @@ -69,6 +69,8 @@ class FormHelperTableLayoutTest extends AbstractTableLayoutTest 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 index 527d73a7f5..2388ba6b67 100644 --- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php @@ -45,6 +45,8 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase { $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 index ca84b5dc22..9101e45308 100644 --- 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 @@ abstract class TypeTestCase extends FormIntegrationTestCase $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 index 536ff4c824..428265a18c 100644 --- a/src/Symfony/Component/Form/Tests/FormIntegrationTestCase.php +++ b/src/Symfony/Component/Form/Tests/FormIntegrationTestCase.php @@ -32,6 +32,13 @@ abstract class FormIntegrationTestCase extends \PHPUnit_Framework_TestCase $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()