bug symfony#16101 [Form] add missing deprecation triggers (xabbuh)

fabpot · fabpot · commit c9e938cfea34 · 2015-10-04T10:49:04.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Form] add missing deprecation triggers | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | symfony#15767 | License | MIT | Doc PR | Passing implementations of the pre 2.5 validator API to the constructors of the `ValidatorExtension` and the `ValidationListener` must trigger a deprecation. Commits ------- bcd3946 [Form] add missing deprecation triggers
diff --git a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
@@ -46,6 +46,10 @@ public function __construct($validator, ViolationMapperInterface $violationMappe
             throw new \InvalidArgumentException('Validator must be instance of Symfony\Component\Validator\Validator\ValidatorInterface or Symfony\Component\Validator\ValidatorInterface');
         }
 
+        if ($validator instanceof LegacyValidatorInterface) {
+            @trigger_error('Passing an instance of Symfony\Component\Validator\ValidatorInterface as argument to the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use an implementation of Symfony\Component\Validator\Validator\ValidatorInterface instead', E_USER_DEPRECATED);
+        }
+
         $this->validator = $validator;
         $this->violationMapper = $violationMapper;
     }
diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
@@ -40,6 +40,7 @@ public function __construct($validator)
             $metadata = $validator->getMetadataFor('Symfony\Component\Form\Form');
         // 2.4 API
         } elseif ($validator instanceof LegacyValidatorInterface) {
+            @trigger_error('Passing an instance of Symfony\Component\Validator\ValidatorInterface as argument to the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use an implementation of Symfony\Component\Validator\Validator\ValidatorInterface instead', E_USER_DEPRECATED);
             $metadata = $validator->getMetadataFactory()->getMetadataFor('Symfony\Component\Form\Form');
         } else {
             throw new UnexpectedTypeException($validator, 'Symfony\Component\Validator\Validator\ValidatorInterface or Symfony\Component\Validator\ValidatorInterface');

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,10 @@ public function __construct($validator, ViolationMapperInterface $violationMappe`
`46`	`46`	`throw new \InvalidArgumentException('Validator must be instance of Symfony\Component\Validator\Validator\ValidatorInterface or Symfony\Component\Validator\ValidatorInterface');`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ if ($validator instanceof LegacyValidatorInterface) {`
	`50`	`+ @trigger_error('Passing an instance of Symfony\Component\Validator\ValidatorInterface as argument to the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use an implementation of Symfony\Component\Validator\Validator\ValidatorInterface instead', E_USER_DEPRECATED);`
	`51`	`+ }`
	`52`	`+`
`49`	`53`	`$this->validator = $validator;`
`50`	`54`	`$this->violationMapper = $violationMapper;`
`51`	`55`	`}`