Merge branch '6.4' into 7.2

* 6.4:
  -
  CS fixes

Author: nicolas-grekas

Constraints/ChoiceValidator.php

@@ -53,8 +53,8 @@ public function validate(mixed $value, Constraint $constraint): void
                 throw new ConstraintDefinitionException('The Choice constraint expects a valid callback.');
             }
             $choices = $choices();
-            if (!is_array($choices)) {
-                throw new ConstraintDefinitionException(sprintf('The Choice constraint callback "%s" is expected to return an array, but returned "%s".', trim($this->formatValue($constraint->callback), '"'), get_debug_type($choices)));
+            if (!\is_array($choices)) {
+                throw new ConstraintDefinitionException(\sprintf('The Choice constraint callback "%s" is expected to return an array, but returned "%s".', trim($this->formatValue($constraint->callback), '"'), get_debug_type($choices)));
             }
         } else {
             $choices = $constraint->choices;

Constraints/WeekValidator.php

@@ -43,8 +43,8 @@ public function validate(mixed $value, Constraint $constraint): void
             return;
         }
 
-        [$year, $weekNumber] = \explode('-W', $value, 2);
-        $weeksInYear = (int) \date('W', \mktime(0, 0, 0, 12, 28, $year));
+        [$year, $weekNumber] = explode('-W', $value, 2);
+        $weeksInYear = (int) date('W', mktime(0, 0, 0, 12, 28, $year));
 
         if ($weekNumber > $weeksInYear) {
             $this->context->buildViolation($constraint->invalidWeekNumberMessage)
@@ -56,7 +56,7 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         if ($constraint->min) {
-            [$minYear, $minWeekNumber] = \explode('-W', $constraint->min, 2);
+            [$minYear, $minWeekNumber] = explode('-W', $constraint->min, 2);
             if ($year < $minYear || ($year === $minYear && $weekNumber < $minWeekNumber)) {
                 $this->context->buildViolation($constraint->tooLowMessage)
                     ->setCode(Week::TOO_LOW_ERROR)
@@ -69,7 +69,7 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         if ($constraint->max) {
-            [$maxYear, $maxWeekNumber] = \explode('-W', $constraint->max, 2);
+            [$maxYear, $maxWeekNumber] = explode('-W', $constraint->max, 2);
             if ($year > $maxYear || ($year === $maxYear && $weekNumber > $maxWeekNumber)) {
                 $this->context->buildViolation($constraint->tooHighMessage)
                     ->setCode(Week::TOO_HIGH_ERROR)

Tests/Constraints/LocaleValidatorTest.php

@@ -101,7 +101,7 @@ public function testTooLongLocale()
         $this->validator->validate($locale, $constraint);
 
         $this->buildViolation('myMessage')
-            ->setParameter('{{ value }}', '"' . $locale . '"')
+            ->setParameter('{{ value }}', '"'.$locale.'"')
             ->setCode(Locale::NO_SUCH_LOCALE_ERROR)
             ->assertRaised();
     }

Tests/Mapping/Loader/FilesLoaderTest.php

@@ -36,11 +36,6 @@ public function testCallsActualFileLoaderForMetadata()
 
     public function getFilesLoader(LoaderInterface $loader)
     {
-        return new class([
-            __DIR__.'/constraint-mapping.xml',
-            __DIR__.'/constraint-mapping.yaml',
-            __DIR__.'/constraint-mapping.test',
-            __DIR__.'/constraint-mapping.txt',
-        ], $loader) extends FilesLoader {};
+        return new class([__DIR__.'/constraint-mapping.xml', __DIR__.'/constraint-mapping.yaml', __DIR__.'/constraint-mapping.test', __DIR__.'/constraint-mapping.txt'], $loader) extends FilesLoader {};
     }
 }