Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit c57a9fe108cc · 2019-12-16T12:08:25.000+01:00
* 4.4:
  Use `::class` constants instead of `__NAMESPACE__` when possible
diff --git a/Extension/Core/Type/BirthdayType.php b/Extension/Core/Type/BirthdayType.php
@@ -31,7 +31,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\DateType';
+        return DateType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/ChoiceType.php b/Extension/Core/Type/ChoiceType.php
@@ -373,12 +373,12 @@ private function addSubForm(FormBuilderInterface $builder, string $name, ChoiceV
         ];
 
         if ($options['multiple']) {
-            $choiceType = __NAMESPACE__.'\CheckboxType';
+            $choiceType = CheckboxType::class;
             // The user can check 0 or more checkboxes. If required
             // is true, they are required to check all of them.
             $choiceOpts['required'] = false;
         } else {
-            $choiceType = __NAMESPACE__.'\RadioType';
+            $choiceType = RadioType::class;
         }
 
         $builder->add($name, $choiceType, $choiceOpts);
diff --git a/Extension/Core/Type/CollectionType.php b/Extension/Core/Type/CollectionType.php
@@ -94,7 +94,7 @@ public function configureOptions(OptionsResolver $resolver)
             'prototype' => true,
             'prototype_data' => null,
             'prototype_name' => '__name__',
-            'entry_type' => __NAMESPACE__.'\TextType',
+            'entry_type' => TextType::class,
             'entry_options' => [],
             'delete_empty' => false,
         ]);
diff --git a/Extension/Core/Type/CountryType.php b/Extension/Core/Type/CountryType.php
@@ -47,7 +47,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\ChoiceType';
+        return ChoiceType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/CurrencyType.php b/Extension/Core/Type/CurrencyType.php
@@ -44,7 +44,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\ChoiceType';
+        return ChoiceType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/DateTimeType.php b/Extension/Core/Type/DateTimeType.php
@@ -168,8 +168,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'time' => $timeParts,
                     ]),
                 ]))
-                ->add('date', __NAMESPACE__.'\DateType', $dateOptions)
-                ->add('time', __NAMESPACE__.'\TimeType', $timeOptions)
+                ->add('date', DateType::class, $dateOptions)
+                ->add('time', TimeType::class, $timeOptions)
             ;
         }
 
diff --git a/Extension/Core/Type/EmailType.php b/Extension/Core/Type/EmailType.php
@@ -20,7 +20,7 @@ class EmailType extends AbstractType
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\TextType';
+        return TextType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/LanguageType.php b/Extension/Core/Type/LanguageType.php
@@ -47,7 +47,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\ChoiceType';
+        return ChoiceType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/LocaleType.php b/Extension/Core/Type/LocaleType.php
@@ -44,7 +44,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\ChoiceType';
+        return ChoiceType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/PasswordType.php b/Extension/Core/Type/PasswordType.php
@@ -44,7 +44,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\TextType';
+        return TextType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/RadioType.php b/Extension/Core/Type/RadioType.php
@@ -20,7 +20,7 @@ class RadioType extends AbstractType
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\CheckboxType';
+        return CheckboxType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/RangeType.php b/Extension/Core/Type/RangeType.php
@@ -20,7 +20,7 @@ class RangeType extends AbstractType
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\TextType';
+        return TextType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/RepeatedType.php b/Extension/Core/Type/RepeatedType.php
@@ -47,7 +47,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'type' => __NAMESPACE__.'\TextType',
+            'type' => TextType::class,
             'options' => [],
             'first_options' => [],
             'second_options' => [],
diff --git a/Extension/Core/Type/ResetType.php b/Extension/Core/Type/ResetType.php
@@ -26,7 +26,7 @@ class ResetType extends AbstractType implements ButtonTypeInterface
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\ButtonType';
+        return ButtonType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/SearchType.php b/Extension/Core/Type/SearchType.php
@@ -20,7 +20,7 @@ class SearchType extends AbstractType
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\TextType';
+        return TextType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/SubmitType.php b/Extension/Core/Type/SubmitType.php
@@ -47,7 +47,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\ButtonType';
+        return ButtonType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/TextareaType.php b/Extension/Core/Type/TextareaType.php
@@ -30,7 +30,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\TextType';
+        return TextType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/TimezoneType.php b/Extension/Core/Type/TimezoneType.php
@@ -89,7 +89,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\ChoiceType';
+        return ChoiceType::class;
     }
 
     /**
diff --git a/Extension/Core/Type/UrlType.php b/Extension/Core/Type/UrlType.php
@@ -56,7 +56,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return __NAMESPACE__.'\TextType';
+        return TextType::class;
     }
 
     /**
diff --git a/Extension/Validator/Constraints/FormValidator.php b/Extension/Validator/Constraints/FormValidator.php
@@ -30,7 +30,7 @@ class FormValidator extends ConstraintValidator
     public function validate($form, Constraint $formConstraint)
     {
         if (!$formConstraint instanceof Form) {
-            throw new UnexpectedTypeException($formConstraint, __NAMESPACE__.'\Form');
+            throw new UnexpectedTypeException($formConstraint, Form::class);
         }
 
         if (!$form instanceof FormInterface) {
diff --git a/Tests/Fixtures/FooSubType.php b/Tests/Fixtures/FooSubType.php
@@ -17,6 +17,6 @@ class FooSubType extends AbstractType
 {
     public function getParent(): ?string
     {
-        return __NAMESPACE__.'\FooType';
+        return FooType::class;
     }
 }
diff --git a/Tests/Fixtures/FooTypeBarExtension.php b/Tests/Fixtures/FooTypeBarExtension.php
@@ -30,6 +30,6 @@ public function getAllowedOptionValues()
 
     public static function getExtendedTypes(): iterable
     {
-        return [__NAMESPACE__.'\FooType'];
+        return [FooType::class];
     }
 }
diff --git a/Tests/Fixtures/FooTypeBazExtension.php b/Tests/Fixtures/FooTypeBazExtension.php
@@ -23,6 +23,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
     public static function getExtendedTypes(): iterable
     {
-        return [__NAMESPACE__.'\FooType'];
+        return [FooType::class];
     }
 }
diff --git a/Tests/ResolvedFormTypeTest.php b/Tests/ResolvedFormTypeTest.php
@@ -376,12 +376,12 @@ public function testBlockPrefixDefaultsToFQCNIfNoName($typeClass, $blockPrefix)
     public function provideTypeClassBlockPrefixTuples()
     {
         return [
-            [__NAMESPACE__.'\Fixtures\FooType', 'foo'],
-            [__NAMESPACE__.'\Fixtures\Foo', 'foo'],
-            [__NAMESPACE__.'\Fixtures\Type', 'type'],
-            [__NAMESPACE__.'\Fixtures\FooBarHTMLType', 'foo_bar_html'],
+            [Fixtures\FooType::class, 'foo'],
+            [Fixtures\Foo::class, 'foo'],
+            [Fixtures\Type::class, 'type'],
+            [Fixtures\FooBarHTMLType::class, 'foo_bar_html'],
             [__NAMESPACE__.'\Fixtures\Foo1Bar2Type', 'foo1_bar2'],
-            [__NAMESPACE__.'\Fixtures\FBooType', 'f_boo'],
+            [Fixtures\FBooType::class, 'f_boo'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function configureOptions(OptionsResolver $resolver)`
`31`	`31`	`*/`
`32`	`32`	`public function getParent()`
`33`	`33`	`{`
`34`		`- return __NAMESPACE__.'\DateType';`
	`34`	`+ return DateType::class;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function configureOptions(OptionsResolver $resolver)`
`47`	`47`	`*/`
`48`	`48`	`public function getParent()`
`49`	`49`	`{`
`50`		`- return __NAMESPACE__.'\ChoiceType';`
	`50`	`+ return ChoiceType::class;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function configureOptions(OptionsResolver $resolver)`
`44`	`44`	`*/`
`45`	`45`	`public function getParent()`
`46`	`46`	`{`
`47`		`- return __NAMESPACE__.'\ChoiceType';`
	`47`	`+ return ChoiceType::class;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`168`	`168`	`'time' => $timeParts,`
`169`	`169`	`]),`
`170`	`170`	`]))`
`171`		`- ->add('date', __NAMESPACE__.'\DateType', $dateOptions)`
`172`		`- ->add('time', __NAMESPACE__.'\TimeType', $timeOptions)`
	`171`	`+ ->add('date', DateType::class, $dateOptions)`
	`172`	`+ ->add('time', TimeType::class, $timeOptions)`
`173`	`173`	`;`
`174`	`174`	`}`
`175`	`175`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class EmailType extends AbstractType`
`20`	`20`	`*/`
`21`	`21`	`public function getParent()`
`22`	`22`	`{`
`23`		`- return __NAMESPACE__.'\TextType';`
	`23`	`+ return TextType::class;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/**`