Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 580f6e23a609 · 2019-12-16T12:02:49.000+01:00
* 3.4:
  Use `::class` constants instead of `__NAMESPACE__` when possible
diff --git a/Constraints/AbstractComparisonValidator.php b/Constraints/AbstractComparisonValidator.php
@@ -40,7 +40,7 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof AbstractComparison) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\AbstractComparison');
+            throw new UnexpectedTypeException($constraint, AbstractComparison::class);
         }
 
         if (null === $value) {
diff --git a/Constraints/AllValidator.php b/Constraints/AllValidator.php
@@ -27,7 +27,7 @@ class AllValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof All) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\All');
+            throw new UnexpectedTypeException($constraint, All::class);
         }
 
         if (null === $value) {
diff --git a/Constraints/BicValidator.php b/Constraints/BicValidator.php
@@ -61,7 +61,7 @@ public function __construct(PropertyAccessor $propertyAccessor = null)
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Bic) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Bic');
+            throw new UnexpectedTypeException($constraint, Bic::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/BlankValidator.php b/Constraints/BlankValidator.php
@@ -26,7 +26,7 @@ class BlankValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Blank) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Blank');
+            throw new UnexpectedTypeException($constraint, Blank::class);
         }
 
         if ('' !== $value && null !== $value) {
diff --git a/Constraints/CallbackValidator.php b/Constraints/CallbackValidator.php
@@ -29,7 +29,7 @@ class CallbackValidator extends ConstraintValidator
     public function validate($object, Constraint $constraint)
     {
         if (!$constraint instanceof Callback) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Callback');
+            throw new UnexpectedTypeException($constraint, Callback::class);
         }
 
         $method = $constraint->callback;
diff --git a/Constraints/CardSchemeValidator.php b/Constraints/CardSchemeValidator.php
@@ -99,7 +99,7 @@ class CardSchemeValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof CardScheme) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\CardScheme');
+            throw new UnexpectedTypeException($constraint, CardScheme::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/ChoiceValidator.php b/Constraints/ChoiceValidator.php
@@ -32,7 +32,7 @@ class ChoiceValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Choice) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Choice');
+            throw new UnexpectedTypeException($constraint, Choice::class);
         }
 
         if (!\is_array($constraint->choices) && !$constraint->callback) {
diff --git a/Constraints/CollectionValidator.php b/Constraints/CollectionValidator.php
@@ -27,7 +27,7 @@ class CollectionValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Collection) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Collection');
+            throw new UnexpectedTypeException($constraint, Collection::class);
         }
 
         if (null === $value) {
diff --git a/Constraints/CountValidator.php b/Constraints/CountValidator.php
@@ -27,7 +27,7 @@ class CountValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Count) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Count');
+            throw new UnexpectedTypeException($constraint, Count::class);
         }
 
         if (null === $value) {
diff --git a/Constraints/CountryValidator.php b/Constraints/CountryValidator.php
@@ -31,7 +31,7 @@ class CountryValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Country) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Country');
+            throw new UnexpectedTypeException($constraint, Country::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/CurrencyValidator.php b/Constraints/CurrencyValidator.php
@@ -32,7 +32,7 @@ class CurrencyValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Currency) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Currency');
+            throw new UnexpectedTypeException($constraint, Currency::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/DateTimeValidator.php b/Constraints/DateTimeValidator.php
@@ -27,7 +27,7 @@ class DateTimeValidator extends DateValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof DateTime) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\DateTime');
+            throw new UnexpectedTypeException($constraint, DateTime::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/DateValidator.php b/Constraints/DateValidator.php
@@ -45,7 +45,7 @@ public static function checkDate($year, $month, $day)
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Date) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Date');
+            throw new UnexpectedTypeException($constraint, Date::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/EmailValidator.php b/Constraints/EmailValidator.php
@@ -68,7 +68,7 @@ public function __construct($defaultMode = Email::VALIDATION_MODE_LOOSE)
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Email) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Email');
+            throw new UnexpectedTypeException($constraint, Email::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/ExpressionValidator.php b/Constraints/ExpressionValidator.php
@@ -36,7 +36,7 @@ public function __construct($propertyAccessor = null, ExpressionLanguage $expres
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Expression) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Expression');
+            throw new UnexpectedTypeException($constraint, Expression::class);
         }
 
         $variables = $constraint->values;
diff --git a/Constraints/FileValidator.php b/Constraints/FileValidator.php
@@ -42,7 +42,7 @@ class FileValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof File) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\File');
+            throw new UnexpectedTypeException($constraint, File::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/IbanValidator.php b/Constraints/IbanValidator.php
@@ -143,7 +143,7 @@ class IbanValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Iban) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Iban');
+            throw new UnexpectedTypeException($constraint, Iban::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/ImageValidator.php b/Constraints/ImageValidator.php
@@ -31,7 +31,7 @@ class ImageValidator extends FileValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Image) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Image');
+            throw new UnexpectedTypeException($constraint, Image::class);
         }
 
         $violations = \count($this->context->getViolations());
diff --git a/Constraints/IpValidator.php b/Constraints/IpValidator.php
@@ -30,7 +30,7 @@ class IpValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Ip) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Ip');
+            throw new UnexpectedTypeException($constraint, Ip::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/IsFalseValidator.php b/Constraints/IsFalseValidator.php
@@ -26,7 +26,7 @@ class IsFalseValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof IsFalse) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\IsFalse');
+            throw new UnexpectedTypeException($constraint, IsFalse::class);
         }
 
         if (null === $value || false === $value || 0 === $value || '0' === $value) {
diff --git a/Constraints/IsNullValidator.php b/Constraints/IsNullValidator.php
@@ -26,7 +26,7 @@ class IsNullValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof IsNull) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\IsNull');
+            throw new UnexpectedTypeException($constraint, IsNull::class);
         }
 
         if (null !== $value) {
diff --git a/Constraints/IsTrueValidator.php b/Constraints/IsTrueValidator.php
@@ -26,7 +26,7 @@ class IsTrueValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof IsTrue) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\IsTrue');
+            throw new UnexpectedTypeException($constraint, IsTrue::class);
         }
 
         if (null === $value) {
diff --git a/Constraints/IsbnValidator.php b/Constraints/IsbnValidator.php
@@ -33,7 +33,7 @@ class IsbnValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Isbn) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Isbn');
+            throw new UnexpectedTypeException($constraint, Isbn::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/IssnValidator.php b/Constraints/IssnValidator.php
@@ -32,7 +32,7 @@ class IssnValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Issn) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Issn');
+            throw new UnexpectedTypeException($constraint, Issn::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/LanguageValidator.php b/Constraints/LanguageValidator.php
@@ -31,7 +31,7 @@ class LanguageValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Language) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Language');
+            throw new UnexpectedTypeException($constraint, Language::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/LengthValidator.php b/Constraints/LengthValidator.php
@@ -27,7 +27,7 @@ class LengthValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Length) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Length');
+            throw new UnexpectedTypeException($constraint, Length::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/LocaleValidator.php b/Constraints/LocaleValidator.php
@@ -31,7 +31,7 @@ class LocaleValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Locale) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Locale');
+            throw new UnexpectedTypeException($constraint, Locale::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/LuhnValidator.php b/Constraints/LuhnValidator.php
@@ -40,7 +40,7 @@ class LuhnValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Luhn) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Luhn');
+            throw new UnexpectedTypeException($constraint, Luhn::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/NotBlankValidator.php b/Constraints/NotBlankValidator.php
@@ -27,7 +27,7 @@ class NotBlankValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof NotBlank) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotBlank');
+            throw new UnexpectedTypeException($constraint, NotBlank::class);
         }
 
         if ($constraint->allowNull && null === $value) {
diff --git a/Constraints/NotNullValidator.php b/Constraints/NotNullValidator.php
@@ -26,7 +26,7 @@ class NotNullValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof NotNull) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotNull');
+            throw new UnexpectedTypeException($constraint, NotNull::class);
         }
 
         if (null === $value) {
diff --git a/Constraints/RangeValidator.php b/Constraints/RangeValidator.php
@@ -27,7 +27,7 @@ class RangeValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Range) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Range');
+            throw new UnexpectedTypeException($constraint, Range::class);
         }
 
         if (null === $value) {
diff --git a/Constraints/RegexValidator.php b/Constraints/RegexValidator.php
@@ -30,7 +30,7 @@ class RegexValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Regex) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Regex');
+            throw new UnexpectedTypeException($constraint, Regex::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/TimeValidator.php b/Constraints/TimeValidator.php
@@ -45,7 +45,7 @@ public static function checkTime($hour, $minute, $second)
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Time) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Time');
+            throw new UnexpectedTypeException($constraint, Time::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/TypeValidator.php b/Constraints/TypeValidator.php
@@ -26,7 +26,7 @@ class TypeValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Type) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Type');
+            throw new UnexpectedTypeException($constraint, Type::class);
         }
 
         if (null === $value) {
diff --git a/Constraints/UrlValidator.php b/Constraints/UrlValidator.php
@@ -46,7 +46,7 @@ class UrlValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Url) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Url');
+            throw new UnexpectedTypeException($constraint, Url::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/UuidValidator.php b/Constraints/UuidValidator.php
@@ -68,7 +68,7 @@ class UuidValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Uuid) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Uuid');
+            throw new UnexpectedTypeException($constraint, Uuid::class);
         }
 
         if (null === $value || '' === $value) {
diff --git a/Constraints/ValidValidator.php b/Constraints/ValidValidator.php
@@ -23,7 +23,7 @@ class ValidValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$constraint instanceof Valid) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Valid');
+            throw new UnexpectedTypeException($constraint, Valid::class);
         }
 
         if (null === $value) {
diff --git a/Tests/Mapping/Loader/StaticMethodLoaderTest.php b/Tests/Mapping/Loader/StaticMethodLoaderTest.php
@@ -33,7 +33,7 @@ protected function tearDown(): void
     public function testLoadClassMetadataReturnsTrueIfSuccessful()
     {
         $loader = new StaticMethodLoader('loadMetadata');
-        $metadata = new ClassMetadata(__NAMESPACE__.'\StaticLoaderEntity');
+        $metadata = new ClassMetadata(StaticLoaderEntity::class);
 
         $this->assertTrue($loader->loadClassMetadata($metadata));
     }
@@ -49,7 +49,7 @@ public function testLoadClassMetadataReturnsFalseIfNotSuccessful()
     public function testLoadClassMetadata()
     {
         $loader = new StaticMethodLoader('loadMetadata');
-        $metadata = new ClassMetadata(__NAMESPACE__.'\StaticLoaderEntity');
+        $metadata = new ClassMetadata(StaticLoaderEntity::class);
 
         $loader->loadClassMetadata($metadata);
 
@@ -59,20 +59,20 @@ public function testLoadClassMetadata()
     public function testLoadClassMetadataDoesNotRepeatLoadWithParentClasses()
     {
         $loader = new StaticMethodLoader('loadMetadata');
-        $metadata = new ClassMetadata(__NAMESPACE__.'\StaticLoaderDocument');
+        $metadata = new ClassMetadata(StaticLoaderDocument::class);
         $loader->loadClassMetadata($metadata);
         $this->assertCount(0, $metadata->getConstraints());
 
         $loader = new StaticMethodLoader('loadMetadata');
-        $metadata = new ClassMetadata(__NAMESPACE__.'\BaseStaticLoaderDocument');
+        $metadata = new ClassMetadata(BaseStaticLoaderDocument::class);
         $loader->loadClassMetadata($metadata);
         $this->assertCount(1, $metadata->getConstraints());
     }
 
     public function testLoadClassMetadataIgnoresInterfaces()
     {
         $loader = new StaticMethodLoader('loadMetadata');
-        $metadata = new ClassMetadata(__NAMESPACE__.'\StaticLoaderInterface');
+        $metadata = new ClassMetadata(StaticLoaderInterface::class);
 
         $loader->loadClassMetadata($metadata);
 
@@ -82,7 +82,7 @@ public function testLoadClassMetadataIgnoresInterfaces()
     public function testLoadClassMetadataInAbstractClasses()
     {
         $loader = new StaticMethodLoader('loadMetadata');
-        $metadata = new ClassMetadata(__NAMESPACE__.'\AbstractStaticLoader');
+        $metadata = new ClassMetadata(AbstractStaticLoader::class);
 
         $loader->loadClassMetadata($metadata);
 
@@ -95,7 +95,7 @@ public function testLoadClassMetadataIgnoresAbstractMethods()
         // strict standards error
         error_reporting(0);
 
-        $metadata = new ClassMetadata(__NAMESPACE__.'\AbstractStaticMethodLoader');
+        $metadata = new ClassMetadata(AbstractStaticMethodLoader::class);
 
         $loader = new StaticMethodLoader('loadMetadata');
         $loader->loadClassMetadata($metadata);

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)`
`40`	`40`	`public function validate($value, Constraint $constraint)`
`41`	`41`	`{`
`42`	`42`	`if (!$constraint instanceof AbstractComparison) {`
`43`		`- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\AbstractComparison');`
	`43`	`+ throw new UnexpectedTypeException($constraint, AbstractComparison::class);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`if (null === $value) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class AllValidator extends ConstraintValidator`
`27`	`27`	`public function validate($value, Constraint $constraint)`
`28`	`28`	`{`
`29`	`29`	`if (!$constraint instanceof All) {`
`30`		`- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\All');`
	`30`	`+ throw new UnexpectedTypeException($constraint, All::class);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`if (null === $value) {`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function __construct(PropertyAccessor $propertyAccessor = null)`
`61`	`61`	`public function validate($value, Constraint $constraint)`
`62`	`62`	`{`
`63`	`63`	`if (!$constraint instanceof Bic) {`
`64`		`- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Bic');`
	`64`	`+ throw new UnexpectedTypeException($constraint, Bic::class);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (null === $value \|\| '' === $value) {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class BlankValidator extends ConstraintValidator`
`26`	`26`	`public function validate($value, Constraint $constraint)`
`27`	`27`	`{`
`28`	`28`	`if (!$constraint instanceof Blank) {`
`29`		`- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Blank');`
	`29`	`+ throw new UnexpectedTypeException($constraint, Blank::class);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`if ('' !== $value && null !== $value) {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class CallbackValidator extends ConstraintValidator`
`29`	`29`	`public function validate($object, Constraint $constraint)`
`30`	`30`	`{`
`31`	`31`	`if (!$constraint instanceof Callback) {`
`32`		`- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Callback');`
	`32`	`+ throw new UnexpectedTypeException($constraint, Callback::class);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`$method = $constraint->callback;`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ class CardSchemeValidator extends ConstraintValidator`
`99`	`99`	`public function validate($value, Constraint $constraint)`
`100`	`100`	`{`
`101`	`101`	`if (!$constraint instanceof CardScheme) {`
`102`		`- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\CardScheme');`
	`102`	`+ throw new UnexpectedTypeException($constraint, CardScheme::class);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if (null === $value \|\| '' === $value) {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class ChoiceValidator extends ConstraintValidator`
`32`	`32`	`public function validate($value, Constraint $constraint)`
`33`	`33`	`{`
`34`	`34`	`if (!$constraint instanceof Choice) {`
`35`		`- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Choice');`
	`35`	`+ throw new UnexpectedTypeException($constraint, Choice::class);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`if (!\is_array($constraint->choices) && !$constraint->callback) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class CollectionValidator extends ConstraintValidator`
`27`	`27`	`public function validate($value, Constraint $constraint)`
`28`	`28`	`{`
`29`	`29`	`if (!$constraint instanceof Collection) {`
`30`		`- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Collection');`
	`30`	`+ throw new UnexpectedTypeException($constraint, Collection::class);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`if (null === $value) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class CountValidator extends ConstraintValidator`
`27`	`27`	`public function validate($value, Constraint $constraint)`
`28`	`28`	`{`
`29`	`29`	`if (!$constraint instanceof Count) {`
`30`		`- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Count');`
	`30`	`+ throw new UnexpectedTypeException($constraint, Count::class);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`if (null === $value) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class CountryValidator extends ConstraintValidator`
`31`	`31`	`public function validate($value, Constraint $constraint)`
`32`	`32`	`{`
`33`	`33`	`if (!$constraint instanceof Country) {`
`34`		`- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Country');`
	`34`	`+ throw new UnexpectedTypeException($constraint, Country::class);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if (null === $value \|\| '' === $value) {`