Remove deprecated code paths

nicolas-grekas · nicolas-grekas · commit 2537987d7c97 · 2021-09-07T23:20:46.000+02:00
diff --git a/Extension/Validator/Type/FormTypeValidatorExtension.php b/Extension/Validator/Type/FormTypeValidatorExtension.php
@@ -34,7 +34,6 @@ public function __construct(ValidatorInterface $validator, bool $legacyErrorMess
     {
         $this->validator = $validator;
         $this->violationMapper = new ViolationMapper($formRenderer, $translator);
-        $this->legacyErrorMessages = $legacyErrorMessages;
     }
 
     /**
@@ -62,11 +61,9 @@ public function configureOptions(OptionsResolver $resolver)
             'constraints' => [],
             'invalid_message' => 'This value is not valid.',
             'invalid_message_parameters' => [],
-            'legacy_error_messages' => $this->legacyErrorMessages,
             'allow_extra_fields' => false,
             'extra_fields_message' => 'This form should not contain extra fields.',
         ]);
-        $resolver->setAllowedTypes('legacy_error_messages', 'bool');
 
         $resolver->setNormalizer('constraints', $constraintsNormalizer);
     }
diff --git a/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -12,15 +12,12 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class PercentToLocalizedStringTransformerTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     private $defaultLocale;
 
     protected function setUp(): void
diff --git a/Tests/Extension/Core/Type/ChoiceTypeTest.php b/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
@@ -20,8 +19,6 @@
 
 class ChoiceTypeTest extends BaseTypeTest
 {
-    use ExpectDeprecationTrait;
-
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ChoiceType';
 
     private $choices = [
diff --git a/Tests/Extension/Core/Type/PercentTypeTest.php b/Tests/Extension/Core/Type/PercentTypeTest.php
@@ -11,15 +11,12 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\PercentType;
 use Symfony\Component\Form\Test\TypeTestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class PercentTypeTest extends TypeTestCase
 {
-    use ExpectDeprecationTrait;
-
     public const TESTED_TYPE = PercentType::class;
 
     private $defaultLocale;
diff --git a/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class BirthdayTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/CheckboxTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/CheckboxTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class CheckboxTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/ChoiceTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/ChoiceTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class ChoiceTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/CollectionTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/CollectionTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class CollectionTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/ColorTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/ColorTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\ColorType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class ColorTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/CountryTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/CountryTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\CountryType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class CountryTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/CurrencyTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/CurrencyTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\CurrencyType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class CurrencyTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/DateIntervalTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/DateIntervalTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\DateIntervalType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class DateIntervalTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class DateTimeTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class DateTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/EmailTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/EmailTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class EmailTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/FileTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/FileTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class FileTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\Forms;
@@ -30,7 +29,6 @@
 
 class FormTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     public function testSubmitValidatesData()
diff --git a/Tests/Extension/Validator/Type/HiddenTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/HiddenTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class HiddenTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/IntegerTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/IntegerTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class IntegerTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/LanguageTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/LanguageTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\LanguageType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class LanguageTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/LocaleTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/LocaleTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\LocaleType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class LocaleTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/MoneyTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/MoneyTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class MoneyTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/NumberTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/NumberTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class NumberTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/PasswordTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/PasswordTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class PasswordTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/PercentTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/PercentTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\PercentType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class PercentTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/RadioTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/RadioTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\RadioType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class RadioTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/RangeTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/RangeTypeValidatorExtensionTest.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
 
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\Extension\Core\Type\RangeType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
 class RangeTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
-    use ExpectDeprecationTrait;
     use ValidatorExtensionTrait;
 
     protected function createForm(array $options = [])
diff --git a/Tests/Extension/Validator/Type/RepeatedTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/RepeatedTypeValidatorExtensionTest.php
diff --git a/Tests/Extension/Validator/Type/SearchTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/SearchTypeValidatorExtensionTest.php
diff --git a/Tests/Extension/Validator/Type/TelTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/TelTypeValidatorExtensionTest.php
diff --git a/Tests/Extension/Validator/Type/TimeTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/TimeTypeValidatorExtensionTest.php
diff --git a/Tests/Extension/Validator/Type/TimezoneTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/TimezoneTypeValidatorExtensionTest.php
diff --git a/Tests/Extension/Validator/Type/UrlTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/UrlTypeValidatorExtensionTest.php

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ public function __construct(ValidatorInterface $validator, bool $legacyErrorMess`
`34`	`34`	`{`
`35`	`35`	`$this->validator = $validator;`
`36`	`36`	`$this->violationMapper = new ViolationMapper($formRenderer, $translator);`
`37`		`- $this->legacyErrorMessages = $legacyErrorMessages;`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`/**`
`@@ -62,11 +61,9 @@ public function configureOptions(OptionsResolver $resolver)`
`62`	`61`	`'constraints' => [],`
`63`	`62`	`'invalid_message' => 'This value is not valid.',`
`64`	`63`	`'invalid_message_parameters' => [],`
`65`		`- 'legacy_error_messages' => $this->legacyErrorMessages,`
`66`	`64`	`'allow_extra_fields' => false,`
`67`	`65`	`'extra_fields_message' => 'This form should not contain extra fields.',`
`68`	`66`	`]);`
`69`		`- $resolver->setAllowedTypes('legacy_error_messages', 'bool');`
`70`	`67`
`71`	`68`	`$resolver->setNormalizer('constraints', $constraintsNormalizer);`
`72`	`69`	`}`