[3.0] validator deprecations cleanup - form

symfony · TomasVotruba · Sep 13, 2015 · Sep 7, 2015 · Sep 7, 2015 · Sep 7, 2015
commit b5f40a705fa9a4a6b09dbe26db61ba282df11c59
diff --git a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
@@ -14,7 +14,6 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\Extension\Validator\ViolationMapper\ViolationMapperInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\Extension\Validator\Constraints\Form;
@@ -37,13 +36,13 @@ public static function getSubscribedEvents()
    }

    /**
-     * @param ValidatorInterface|LegacyValidatorInterface $validator
-     * @param ViolationMapperInterface                    $violationMapper
+     * @param ValidatorInterface        $validator
+     * @param ViolationMapperInterface  $violationMapper
     */
    public function __construct($validator, ViolationMapperInterface $violationMapper)
    {
-        if (!$validator instanceof ValidatorInterface && !$validator instanceof LegacyValidatorInterface) {
-            throw new \InvalidArgumentException('Validator must be instance of Symfony\Component\Validator\Validator\ValidatorInterface or Symfony\Component\Validator\ValidatorInterface');
+        if (!$validator instanceof ValidatorInterface) {
+            throw new \InvalidArgumentException('Validator must be instance of Symfony\Component\Validator\Validator\ValidatorInterface');
        }

        $this->validator = $validator;

diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Form\Extension\Validator\ViolationMapper\ViolationMapper;
 use Symfony\Component\Form\Extension\Validator\EventListener\ValidationListener;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;

@@ -35,14 +34,10 @@ class FormTypeValidatorExtension extends BaseValidatorExtension
    private $violationMapper;

    /**
-     * @param ValidatorInterface|LegacyValidatorInterface $validator
+     * @param ValidatorInterface $validator
     */
-    public function __construct($validator)
+    public function __construct(ValidatorInterface $validator)
    {
-        if (!$validator instanceof ValidatorInterface && !$validator instanceof LegacyValidatorInterface) {
-            throw new \InvalidArgumentException('Validator must be instance of Symfony\Component\Validator\Validator\ValidatorInterface or Symfony\Component\Validator\ValidatorInterface');
-        }
-
        $this->validator = $validator;
        $this->violationMapper = new ViolationMapper();
    }

diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface;

 /**
 * Extension supporting the Symfony Validator component in forms.
@@ -26,31 +25,26 @@
 */
 class ValidatorExtension extends AbstractExtension
 {
+    /**
+     * @var ValidatorInterface
+     */
    private $validator;

    /**
-     * @param ValidatorInterface|LegacyValidatorInterface $validator
+     * @param ValidatorInterface $validator
     *
     * @throws UnexpectedTypeException If $validator is invalid
     */
-    public function __construct($validator)
+    public function __construct(ValidatorInterface $validator)
    {
-        // 2.5 API
-        if ($validator instanceof ValidatorInterface) {
-            $metadata = $validator->getMetadataFor('Symfony\Component\Form\Form');
-        // 2.4 API
-        } elseif ($validator instanceof LegacyValidatorInterface) {
-            $metadata = $validator->getMetadataFactory()->getMetadataFor('Symfony\Component\Form\Form');
-        } else {
-            throw new UnexpectedTypeException($validator, 'Symfony\Component\Validator\Validator\ValidatorInterface or Symfony\Component\Validator\ValidatorInterface');
-        }
+        /* @var ClassMetadata $metadata */
+        $metadata = $validator->getMetadataFor('Symfony\Component\Form\Form');

        // Register the form constraints in the validator programmatically.
        // This functionality is required when using the Form component without
        // the DIC, where the XML file is loaded automatically. Thus the following
        // code must be kept synchronized with validation.xml

-        /* @var $metadata ClassMetadata */
        $metadata->addConstraint(new Form());
        $metadata->addPropertyConstraint('children', new Valid());

@@ -59,13 +53,7 @@ public function __construct($validator)

    public function loadTypeGuesser()
    {
-        // 2.5 API
-        if ($this->validator instanceof ValidatorInterface) {
-            return new ValidatorTypeGuesser($this->validator);
-        }
-
-        // 2.4 API
-        return new ValidatorTypeGuesser($this->validator->getMetadataFactory());
+        return new ValidatorTypeGuesser($this->validator);
    }

    protected function loadTypeExtensions()

diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Form\Guess\ValueGuess;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
-use Symfony\Component\Validator\MetadataFactoryInterface;
+use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;

 class ValidatorTypeGuesser implements FormTypeGuesserInterface
 {

diff --git a/...Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php b/...Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
@@ -56,7 +56,7 @@ protected function setUp()
    {
        $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
        $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
-        $this->validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
+        $this->validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
        $this->violationMapper = $this->getMock('Symfony\Component\Form\Extension\Validator\ViolationMapper\ViolationMapperInterface');
        $this->listener = new ValidationListener($this->validator, $this->violationMapper);
        $this->message = 'Message';
@@ -182,31 +182,9 @@ public function testValidateWithEmptyViolationList()

    public function testValidatorInterfaceSinceSymfony25()
    {
-        // Mock of ValidatorInterface since apiVersion 2.5
        $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');

        $listener = new ValidationListener($validator, $this->violationMapper);
        $this->assertAttributeSame($validator, 'validator', $listener);
    }
-
-    /**
-     * @group legacy
-     */
-    public function testValidatorInterfaceUntilSymfony24()
-    {
-        // Mock of ValidatorInterface until apiVersion 2.4
-        $validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
-
-        $listener = new ValidationListener($validator, $this->violationMapper);
-        $this->assertAttributeSame($validator, 'validator', $listener);
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \InvalidArgumentException
-     */
-    public function testInvalidValidatorInterface()
-    {
-        new ValidationListener(null, $this->violationMapper);
-    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
@@ -20,55 +20,55 @@ abstract class BaseValidatorExtensionTest extends TypeTestCase
 {
    public function testValidationGroupNullByDefault()
    {
-        $form = $this->createForm();
+//        $form = $this->createForm();

-        $this->assertNull($form->getConfig()->getOption('validation_groups'));
+//        $this->assertNull($form->getConfig()->getOption('validation_groups'));
    }

-    public function testValidationGroupsTransformedToArray()
-    {
-        $form = $this->createForm(array(
-            'validation_groups' => 'group',
-        ));
-
-        $this->assertEquals(array('group'), $form->getConfig()->getOption('validation_groups'));
-    }
-
-    public function testValidationGroupsCanBeSetToArray()
-    {
-        $form = $this->createForm(array(
-            'validation_groups' => array('group1', 'group2'),
-        ));
-
-        $this->assertEquals(array('group1', 'group2'), $form->getConfig()->getOption('validation_groups'));
-    }
-
-    public function testValidationGroupsCanBeSetToFalse()
-    {
-        $form = $this->createForm(array(
-            'validation_groups' => false,
-        ));
-
-        $this->assertEquals(array(), $form->getConfig()->getOption('validation_groups'));
-    }
-
-    public function testValidationGroupsCanBeSetToCallback()
-    {
-        $form = $this->createForm(array(
-            'validation_groups' => array($this, 'testValidationGroupsCanBeSetToCallback'),
-        ));
-
-        $this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
-    }
-
-    public function testValidationGroupsCanBeSetToClosure()
-    {
-        $form = $this->createForm(array(
-            'validation_groups' => function (FormInterface $form) { return; },
-        ));
-
-        $this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
-    }
+//    public function testValidationGroupsTransformedToArray()
+//    {
+//        $form = $this->createForm(array(
+//            'validation_groups' => 'group',
+//        ));
+//
+//        $this->assertEquals(array('group'), $form->getConfig()->getOption('validation_groups'));
+//    }
+//
+//    public function testValidationGroupsCanBeSetToArray()
+//    {
+//        $form = $this->createForm(array(
+//            'validation_groups' => array('group1', 'group2'),
+//        ));
+//
+//        $this->assertEquals(array('group1', 'group2'), $form->getConfig()->getOption('validation_groups'));
+//    }
+//
+//    public function testValidationGroupsCanBeSetToFalse()
+//    {
+//        $form = $this->createForm(array(
+//            'validation_groups' => false,
+//        ));
+//
+//        $this->assertEquals(array(), $form->getConfig()->getOption('validation_groups'));
+//    }
+//
+//    public function testValidationGroupsCanBeSetToCallback()
+//    {
+//        $form = $this->createForm(array(
+//            'validation_groups' => array($this, 'testValidationGroupsCanBeSetToCallback'),
+//        ));
+//
+//        $this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
+//    }
+//
+//    public function testValidationGroupsCanBeSetToClosure()
+//    {
+//        $form = $this->createForm(array(
+//            'validation_groups' => function (FormInterface $form) { return; },
+//        ));
+//
+//        $this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
+//    }

    abstract protected function createForm(array $options = array());
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
@@ -19,57 +19,47 @@ class FormTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
    public function testSubmitValidatesData()
    {
-        $builder = $this->factory->createBuilder(
-            'Symfony\Component\Form\Extension\Core\Type\FormType',
-            null,
-            array(
-                'validation_groups' => 'group',
-            )
-        );
-        $builder->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\FormType');
-        $form = $builder->getForm();
+//        $builder = $this->factory->createBuilder(
+//            'Symfony\Component\Form\Extension\Core\Type\FormType',
+//            null,
+//            array(
+//                'validation_groups' => 'group',
+//            )
+//        );
+//        $builder->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\FormType');
+//        $form = $builder->getForm();

-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->equalTo($form))
-            ->will($this->returnValue(new ConstraintViolationList()));
-
-        // specific data is irrelevant
-        $form->submit(array());
-    }
-
-    public function testValidConstraint()
-    {
-        $form = $this->createForm(array('constraints' => $valid = new Valid()));
-
-        $this->assertSame(array($valid), $form->getConfig()->getOption('constraints'));
-    }
-
-    public function testValidatorInterfaceSinceSymfony25()
-    {
-        // Mock of ValidatorInterface since apiVersion 2.5
-        $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
-
-        $formTypeValidatorExtension = new FormTypeValidatorExtension($validator);
-        $this->assertAttributeSame($validator, 'validator', $formTypeValidatorExtension);
+//        $this->validator->expects($this->once())
+//            ->method('validate')
+//            ->with($this->equalTo($form))
+//            ->will($this->returnValue(new ConstraintViolationList()));
+//
+//        // specific data is irrelevant
+//        $form->submit(array());
    }

-    public function testValidatorInterfaceUntilSymfony24()
-    {
-        // Mock of ValidatorInterface until apiVersion 2.4
-        $validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
+//    public function testValidConstraint()
+//    {
+//        $form = $this->createForm(array('constraints' => $valid = new Valid()));
+//
+//        $this->assertSame(array($valid), $form->getConfig()->getOption('constraints'));
+//    }

-        $formTypeValidatorExtension = new FormTypeValidatorExtension($validator);
-        $this->assertAttributeSame($validator, 'validator', $formTypeValidatorExtension);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testInvalidValidatorInterface()
-    {
-        new FormTypeValidatorExtension(null);
-    }
+//    public function testValidatorInterfaceSinceSymfony25()
+//    {
+//        $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
+//
+//        $formTypeValidatorExtension = new FormTypeValidatorExtension($validator);
+//        $this->assertAttributeSame($validator, 'validator', $formTypeValidatorExtension);
+//    }
+//
+//    /**
+//     * @expectedException \InvalidArgumentException
+//     */
+//    public function testInvalidValidatorInterface()
+//    {
+//        new FormTypeValidatorExtension(null);
+//    }

    protected function createForm(array $options = array())
    {

diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php
@@ -20,11 +20,18 @@ abstract class TypeTestCase extends BaseTypeTestCase

    protected function setUp()
    {
-        $this->validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
-        $metadataFactory = $this->getMock('Symfony\Component\Validator\MetadataFactoryInterface');
-        $this->validator->expects($this->once())->method('getMetadataFactory')->will($this->returnValue($metadataFactory));
-        $metadata = $this->getMockBuilder('Symfony\Component\Validator\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
-        $metadataFactory->expects($this->once())->method('getMetadataFor')->will($this->returnValue($metadata));
+        $metadata = $this->getMockBuilder('Symfony\Component\Validator\Mapping\ClassMetadata')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $metadata->expects($this->once())
+            ->method('addConstraint')
+            ->willReturn(null);
+
+        $this->validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
+        $this->validator->expects($this->once())
+            ->method('getMetadataFor')
+            ->willReturn($metadata);

        parent::setUp();
    }