Merge branch '6.1' into 6.2

nicolas-grekas · nicolas-grekas · commit 736d051dbd82 · 2022-06-27T19:32:32.000+02:00
* 6.1:
  CS fixes
  Bump Symfony version to 6.1.3
  Update VERSION for 6.1.2
  Update CHANGELOG for 6.1.2
  Bump Symfony version to 6.0.11
  Update VERSION for 6.0.10
  Update CHANGELOG for 6.0.10
  Bump Symfony version to 5.4.11
  Update VERSION for 5.4.10
  Update CHANGELOG for 5.4.10
  Bump Symfony version to 4.4.44
  Update VERSION for 4.4.43
  Update CONTRIBUTORS for 4.4.43
  Update CHANGELOG for 4.4.43
diff --git a/Constraints/BicValidator.php b/Constraints/BicValidator.php
@@ -68,7 +68,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/CountryValidator.php b/Constraints/CountryValidator.php
@@ -37,7 +37,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/CurrencyValidator.php b/Constraints/CurrencyValidator.php
@@ -38,7 +38,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/DateTimeValidator.php b/Constraints/DateTimeValidator.php
@@ -34,7 +34,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/DateValidator.php b/Constraints/DateValidator.php
@@ -46,7 +46,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
@@ -62,9 +62,9 @@ public function validate(mixed $value, Constraint $constraint)
         }
 
         if (!self::checkDate(
-          $matches['year'] ?? $matches[1],
-          $matches['month'] ?? $matches[2],
-          $matches['day'] ?? $matches[3]
+            $matches['year'] ?? $matches[1],
+            $matches['month'] ?? $matches[2],
+            $matches['day'] ?? $matches[3]
         )) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
diff --git a/Constraints/EmailValidator.php b/Constraints/EmailValidator.php
@@ -60,7 +60,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/FileValidator.php b/Constraints/FileValidator.php
@@ -116,7 +116,7 @@ public function validate(mixed $value, Constraint $constraint)
             }
         }
 
-        if (!is_scalar($value) && !$value instanceof FileObject && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof FileObject && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/HostnameValidator.php b/Constraints/HostnameValidator.php
@@ -41,7 +41,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/IbanValidator.php b/Constraints/IbanValidator.php
@@ -150,7 +150,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/IpValidator.php b/Constraints/IpValidator.php
@@ -37,7 +37,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/IsbnValidator.php b/Constraints/IsbnValidator.php
@@ -40,7 +40,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/IsinValidator.php b/Constraints/IsinValidator.php
@@ -36,7 +36,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/IssnValidator.php b/Constraints/IssnValidator.php
@@ -39,7 +39,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/JsonValidator.php b/Constraints/JsonValidator.php
@@ -33,7 +33,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedTypeException($value, 'string');
         }
 
diff --git a/Constraints/LanguageValidator.php b/Constraints/LanguageValidator.php
@@ -37,7 +37,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/LengthValidator.php b/Constraints/LengthValidator.php
@@ -34,7 +34,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/LocaleValidator.php b/Constraints/LocaleValidator.php
@@ -37,7 +37,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/NotCompromisedPasswordValidator.php b/Constraints/NotCompromisedPasswordValidator.php
@@ -63,7 +63,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (null !== $value && !is_scalar($value) && !$value instanceof \Stringable) {
+        if (null !== $value && !\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/RegexValidator.php b/Constraints/RegexValidator.php
@@ -37,7 +37,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/TimeValidator.php b/Constraints/TimeValidator.php
@@ -46,7 +46,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/TimezoneValidator.php b/Constraints/TimezoneValidator.php
@@ -39,7 +39,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/UlidValidator.php b/Constraints/UlidValidator.php
@@ -37,7 +37,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/UrlValidator.php b/Constraints/UrlValidator.php
@@ -58,7 +58,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Constraints/UuidValidator.php b/Constraints/UuidValidator.php
@@ -72,7 +72,7 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        if (!is_scalar($value) && !$value instanceof \Stringable) {
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
 
diff --git a/Tests/Constraints/EmailValidatorTest.php b/Tests/Constraints/EmailValidatorTest.php
@@ -348,7 +348,7 @@ public function getInvalidEmailsForStrictChecks()
             ['test@email>'],
             ['test@email<'],
             ['test@email{'],
-            [str_repeat('x', 254).'@example.com'], //email with warnings
+            [str_repeat('x', 254).'@example.com'], // email with warnings
         ];
     }
 }
diff --git a/Validator/RecursiveContextualValidator.php b/Validator/RecursiveContextualValidator.php
@@ -468,15 +468,15 @@ private function validateClassNode(object $object, ?string $cacheKey, ClassMetad
             // group sequence and abort if necessary (G1, G2)
             if ($group instanceof GroupSequence) {
                 $this->stepThroughGroupSequence(
-                     $object,
-                     $object,
-                     $cacheKey,
-                     $metadata,
-                     $propertyPath,
-                     $traversalStrategy,
-                     $group,
-                     $defaultOverridden ? Constraint::DEFAULT_GROUP : null,
-                     $context
+                    $object,
+                    $object,
+                    $cacheKey,
+                    $metadata,
+                    $propertyPath,
+                    $traversalStrategy,
+                    $group,
+                    $defaultOverridden ? Constraint::DEFAULT_GROUP : null,
+                    $context
                 );
 
                 // Skip the group sequence when validating properties, because
@@ -582,15 +582,15 @@ private function validateGenericNode(mixed $value, ?object $object, ?string $cac
         foreach ($groups as $key => $group) {
             if ($group instanceof GroupSequence) {
                 $this->stepThroughGroupSequence(
-                     $value,
-                     $object,
-                     $cacheKey,
-                     $metadata,
-                     $propertyPath,
-                     $traversalStrategy,
-                     $group,
-                     null,
-                     $context
+                    $value,
+                    $object,
+                    $cacheKey,
+                    $metadata,
+                    $propertyPath,
+                    $traversalStrategy,
+                    $group,
+                    null,
+                    $context
                 );
 
                 // Skip the group sequence when cascading, as the cascading
@@ -686,26 +686,26 @@ private function stepThroughGroupSequence(mixed $value, ?object $object, ?string
 
             if ($metadata instanceof ClassMetadataInterface) {
                 $this->validateClassNode(
-                     $value,
-                     $cacheKey,
-                     $metadata,
-                     $propertyPath,
-                     $groups,
-                     $cascadedGroups,
-                     $traversalStrategy,
-                     $context
+                    $value,
+                    $cacheKey,
+                    $metadata,
+                    $propertyPath,
+                    $groups,
+                    $cascadedGroups,
+                    $traversalStrategy,
+                    $context
                 );
             } else {
                 $this->validateGenericNode(
-                     $value,
-                     $object,
-                     $cacheKey,
-                     $metadata,
-                     $propertyPath,
-                     $groups,
-                     $cascadedGroups,
-                     $traversalStrategy,
-                     $context
+                    $value,
+                    $object,
+                    $cacheKey,
+                    $metadata,
+                    $propertyPath,
+                    $groups,
+                    $cascadedGroups,
+                    $traversalStrategy,
+                    $context
                 );
             }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function validate(mixed $value, Constraint $constraint)`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`	`70`
`71`		`- if (!is_scalar($value) && !$value instanceof \Stringable) {`
	`71`	`+ if (!\is_scalar($value) && !$value instanceof \Stringable) {`
`72`	`72`	`throw new UnexpectedValueException($value, 'string');`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function validate(mixed $value, Constraint $constraint)`
`37`	`37`	`return;`
`38`	`38`	`}`
`39`	`39`
`40`		`- if (!is_scalar($value) && !$value instanceof \Stringable) {`
	`40`	`+ if (!\is_scalar($value) && !$value instanceof \Stringable) {`
`41`	`41`	`throw new UnexpectedValueException($value, 'string');`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function validate(mixed $value, Constraint $constraint)`
`38`	`38`	`return;`
`39`	`39`	`}`
`40`	`40`
`41`		`- if (!is_scalar($value) && !$value instanceof \Stringable) {`
	`41`	`+ if (!\is_scalar($value) && !$value instanceof \Stringable) {`
`42`	`42`	`throw new UnexpectedValueException($value, 'string');`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function validate(mixed $value, Constraint $constraint)`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`
`37`		`- if (!is_scalar($value) && !$value instanceof \Stringable) {`
	`37`	`+ if (!\is_scalar($value) && !$value instanceof \Stringable) {`
`38`	`38`	`throw new UnexpectedValueException($value, 'string');`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function validate(mixed $value, Constraint $constraint)`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`	`48`
`49`		`- if (!is_scalar($value) && !$value instanceof \Stringable) {`
	`49`	`+ if (!\is_scalar($value) && !$value instanceof \Stringable) {`
`50`	`50`	`throw new UnexpectedValueException($value, 'string');`
`51`	`51`	`}`
`52`	`52`
`@@ -62,9 +62,9 @@ public function validate(mixed $value, Constraint $constraint)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if (!self::checkDate(`
`65`		`- $matches['year'] ?? $matches[1],`
`66`		`- $matches['month'] ?? $matches[2],`
`67`		`- $matches['day'] ?? $matches[3]`
	`65`	`+ $matches['year'] ?? $matches[1],`
	`66`	`+ $matches['month'] ?? $matches[2],`
	`67`	`+ $matches['day'] ?? $matches[3]`
`68`	`68`	`)) {`
`69`	`69`	`$this->context->buildViolation($constraint->message)`
`70`	`70`	`->setParameter('{{ value }}', $this->formatValue($value))`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function validate(mixed $value, Constraint $constraint)`
`60`	`60`	`return;`
`61`	`61`	`}`
`62`	`62`
`63`		`- if (!is_scalar($value) && !$value instanceof \Stringable) {`
	`63`	`+ if (!\is_scalar($value) && !$value instanceof \Stringable) {`
`64`	`64`	`throw new UnexpectedValueException($value, 'string');`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public function validate(mixed $value, Constraint $constraint)`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`		`- if (!is_scalar($value) && !$value instanceof FileObject && !$value instanceof \Stringable) {`
	`119`	`+ if (!\is_scalar($value) && !$value instanceof FileObject && !$value instanceof \Stringable) {`
`120`	`120`	`throw new UnexpectedValueException($value, 'string');`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function validate(mixed $value, Constraint $constraint)`
`41`	`41`	`return;`
`42`	`42`	`}`
`43`	`43`
`44`		`- if (!is_scalar($value) && !$value instanceof \Stringable) {`
	`44`	`+ if (!\is_scalar($value) && !$value instanceof \Stringable) {`
`45`	`45`	`throw new UnexpectedValueException($value, 'string');`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public function validate(mixed $value, Constraint $constraint)`
`150`	`150`	`return;`
`151`	`151`	`}`
`152`	`152`
`153`		`- if (!is_scalar($value) && !$value instanceof \Stringable) {`
	`153`	`+ if (!\is_scalar($value) && !$value instanceof \Stringable) {`
`154`	`154`	`throw new UnexpectedValueException($value, 'string');`
`155`	`155`	`}`
`156`	`156`