Permalink
Browse files

merged branch stof/form_cleanup (PR #3931)

Commits
-------

538819a [Form] Fixed the tests
9e956a8 [Form] Cleaned the FormValidatorInterface deprecation

Discussion
----------

[Form] Cleaned the FormValidatorInterface deprecation

This fixes my feedback on #3797

[![Build Status](https://secure.travis-ci.org/stof/symfony.png?branch=form_cleanup)](http://travis-ci.org/stof/symfony)
  • Loading branch information...
2 parents 8e59a4e + 538819a commit d9fa1b94ae1edb163dc40d3d7e72b67bec2c2ac8 @fabpot fabpot committed Apr 13, 2012
@@ -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;
@@ -802,18 +802,6 @@ public function getClientTransformers()
}
/**
- * 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.
*
* @return array
@@ -32,14 +32,18 @@ class DelegatingValidationListenerTest extends \PHPUnit_Framework_TestCase
private $delegate;
- private $validator;
+ private $listener;
private $message;
private $params;
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');
@@ -1294,16 +1294,6 @@ public function testFormCannotHaveEmptyNameNotInRootLevel()
->getForm();
}
- public function testGetValidatorsReturnsValidators()
- {
- $validator = $this->getFormValidator();
- $form = $this->getBuilder()
- ->addValidator($validator)
- ->getForm();
-
- $this->assertEquals(array($validator), $form->getValidators());
- }
-
protected function getBuilder($name = 'name', EventDispatcherInterface $dispatcher = null)
{
return new FormBuilder($name, $this->factory, $dispatcher ?: $this->dispatcher);

0 comments on commit d9fa1b9

Please sign in to comment.