fabpot update

eltharin · eltharin · commit 4d08d19066fc · 2025-01-09T21:26:08.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Validation/UniqueFieldEntityFormValidationTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Validation/UniqueFieldEntityFormValidationTest.php
@@ -1,27 +1,31 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bridge\Doctrine\Tests\Form\Validation;
 
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension;
 use Symfony\Bridge\Doctrine\Tests\DoctrineTestHelper;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\UniqueFieldFormValidationEntity;
-use Symfony\Bridge\Doctrine\Tests\Fixtures\UniqueGroupFieldsEntity;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator;
 use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
 use Symfony\Component\Form\Extension\Validator\ViolationMapper\ViolationMapper;
-use Symfony\Component\Form\Forms;
-use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTestCase;
+use Symfony\Component\Form\Test\TypeTestCase;
 use Symfony\Component\Form\Tests\Extension\Core\Type\FormTypeTest;
 use Symfony\Component\Form\Tests\Extension\Core\Type\TextTypeTest;
 use Symfony\Component\Validator\ConstraintValidatorFactory;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\Validation;
-use Symfony\Component\Form\Test\TypeTestCase;
 
 class UniqueFieldEntityFormValidationTest extends TypeTestCase
 {
@@ -46,10 +50,11 @@ protected function createRegistryMock($name, $em): MockObject&ManagerRegistry
 
         return $registry;
     }
+
     protected function getExtensions(): array
     {
         $factory = new ConstraintValidatorFactory([
-            'doctrine.orm.validator.unique' => new UniqueEntityValidator($this->emRegistry)
+            'doctrine.orm.validator.unique' => new UniqueEntityValidator($this->emRegistry),
         ]);
 
         $validator = Validation::createValidatorBuilder()
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -208,7 +208,7 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         $errorPath = $constraint->errorPath ?? implode(', ', array_keys($criteria));
-        $invalidValue = $criteria[$errorPath] ?? implode(', ', array_map(fn ($o) => is_object($o) ? '"object"' : $o, $criteria));
+        $invalidValue = $criteria[$errorPath] ?? implode(', ', array_map(fn ($o) => \is_object($o) ? '"object"' : $o, $criteria));
 
         $violation = $this->context->buildViolation($constraint->message)
             ->atPath($errorPath)
@@ -217,8 +217,8 @@ public function validate(mixed $value, Constraint $constraint): void
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->setCause($result);
 
-        if(\is_array($criteria) && \count($criteria) > 1) {
-            foreach($criteria as $field => $value) {
+        if (\is_array($criteria) && \count($criteria) > 1) {
+            foreach ($criteria as $field => $value) {
                 $violation->setParameter('{{ '.$field.' value }}', $this->formatWithIdentifiers($em, $class, $value));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public function validate(mixed $value, Constraint $constraint): void`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`$errorPath = $constraint->errorPath ?? implode(', ', array_keys($criteria));`
`211`		`- $invalidValue = $criteria[$errorPath] ?? implode(', ', array_map(fn ($o) => is_object($o) ? '"object"' : $o, $criteria));`
	`211`	`+ $invalidValue = $criteria[$errorPath] ?? implode(', ', array_map(fn ($o) => \is_object($o) ? '"object"' : $o, $criteria));`
`212`	`212`
`213`	`213`	`$violation = $this->context->buildViolation($constraint->message)`
`214`	`214`	`->atPath($errorPath)`
`@@ -217,8 +217,8 @@ public function validate(mixed $value, Constraint $constraint): void`
`217`	`217`	`->setCode(UniqueEntity::NOT_UNIQUE_ERROR)`
`218`	`218`	`->setCause($result);`
`219`	`219`
`220`		`- if(\is_array($criteria) && \count($criteria) > 1) {`
`221`		`- foreach($criteria as $field => $value) {`
	`220`	`+ if (\is_array($criteria) && \count($criteria) > 1) {`
	`221`	`+ foreach ($criteria as $field => $value) {`
`222`	`222`	`$violation->setParameter('{{ '.$field.' value }}', $this->formatWithIdentifiers($em, $class, $value));`
`223`	`223`	`}`
`224`	`224`	`}`