Implement check using an interface

Mathieu Lechat · Mathieu Lechat · commit 0b87dea1d19c · 2017-11-15T15:35:10.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/EntityDto.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/EntityDto.php
@@ -0,0 +1,17 @@
+<?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\Validator\Constraints;
+
+interface EntityDto
+{
+    public function isForEntity($entity): bool;
+}
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
@@ -33,7 +33,6 @@ class UniqueEntity extends Constraint
     public $fields = array();
     public $errorPath = null;
     public $ignoreNull = true;
-    public $forUpdate = false;
 
     protected static $errorNames = array(
         self::NOT_UNIQUE_ERROR => 'NOT_UNIQUE_ERROR',
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -147,11 +147,13 @@ public function validate($entity, Constraint $constraint)
         }
 
         if (1 === count($result)) {
-            if ($constraint->forUpdate) {
+            $match = $result instanceof \Iterator ? $result->current() : current($result);
+
+            if ($entity === $match) {
                 return;
             }
 
-            if ($entity === ($result instanceof \Iterator ? $result->current() : current($result))) {
+            if ($entity instanceof EntityDto && $entity->isForEntity($match)) {
                 return;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -147,11 +147,13 @@ public function validate($entity, Constraint $constraint)`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`if (1 === count($result)) {`
`150`		`- if ($constraint->forUpdate) {`
	`150`	`+ $match = $result instanceof \Iterator ? $result->current() : current($result);`
	`151`	`+`
	`152`	`+ if ($entity === $match) {`
`151`	`153`	`return;`
`152`	`154`	`}`
`153`	`155`
`154`		`- if ($entity === ($result instanceof \Iterator ? $result->current() : current($result))) {`
	`156`	`+ if ($entity instanceof EntityDto && $entity->isForEntity($match)) {`
`155`	`157`	`return;`
`156`	`158`	`}`
`157`	`159`	`}`