diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index 2c8f3c622c..8f9e7b6de2 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -77,7 +77,7 @@ class Form implements \IteratorAggregate, FormInterface /** * The mapper for mapping data to children and back - * @var DataMapper\DataMapperInterface + * @var DataMapperInterface */ private $dataMapper; @@ -801,18 +801,6 @@ class Form implements \IteratorAggregate, FormInterface return $this->clientTransformers; } - /** - * Returns the Validators - * - * @return array An array of FormValidatorInterface - * - * @deprecated Deprecated since version 2.1, to be removed in 2.3. - */ - public function getValidators() - { - return $this->validators; - } - /** * Returns all children in this group. * diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/DelegatingValidationListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/DelegatingValidationListenerTest.php index 8c6a5bb538..0071b36fd7 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/DelegatingValidationListenerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/DelegatingValidationListenerTest.php @@ -32,7 +32,7 @@ class DelegatingValidationListenerTest extends \PHPUnit_Framework_TestCase private $delegate; - private $validator; + private $listener; private $message; @@ -40,6 +40,10 @@ class DelegatingValidationListenerTest extends \PHPUnit_Framework_TestCase protected function setUp() { + if (!class_exists('Symfony\Component\EventDispatcher\Event')) { + $this->markTestSkipped('The "EventDispatcher" component is not available'); + } + $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface'); $this->delegate = $this->getMock('Symfony\Component\Validator\ValidatorInterface');