Add ability retrieve errors by their code.

Koc · Koc · commit 19d66baa3afa · 2016-08-01T11:29:35.000+03:00
diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Form\Exception\InvalidArgumentException;
 use Symfony\Component\Form\Exception\OutOfBoundsException;
 use Symfony\Component\Form\Exception\BadMethodCallException;
+use Symfony\Component\Validator\ConstraintViolation;
 
 /**
  * Iterates over the errors of a form.
@@ -265,6 +266,16 @@ public function seek($position)
         }
     }
 
+    public function getFormErrorByCode($code)
+    {
+        foreach ($this as $formError) {
+            $cause = $formError->getCause();
+            if ($cause instanceof ConstraintViolation && $cause->getCode() === $code) {
+                return $formError;
+            }
+        }
+    }
+
     /**
      * Utility function for indenting multi-line strings.
      *
diff --git a/src/Symfony/Component/Form/Tests/FormErrorIteratorTest.php b/src/Symfony/Component/Form/Tests/FormErrorIteratorTest.php
@@ -0,0 +1,46 @@
+<?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\Component\Form\Tests;
+
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Validator\ConstraintViolation;
+
+class FormErrorIteratorTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetFormErrorByCode()
+    {
+        if (!class_exists(ConstraintViolation::class)) {
+            $this->markTestSkipped('Validator component required.');
+        }
+
+        $formBuilder = new FormBuilder(
+            'form',
+            null,
+            new EventDispatcher(),
+            $this->getMock('Symfony\Component\Form\FormFactoryInterface'),
+            array()
+        );
+
+        $form = $formBuilder->getForm();
+
+        $code = 'code';
+
+        $cause = new ConstraintViolation('Error!', null, array(), null, '', null, null, $code);
+        $form->addError(new FormError('Error!', null, array(), null, $cause));
+        $formErrors = $form->getErrors();
+
+        $this->assertInstanceOf(FormError::class, $formErrors->getFormErrorByCode($code));
+        $this->assertNull($formErrors->getFormErrorByCode('not-existent-code'));
+    }
+}
diff --git a/src/Symfony/Component/Validator/ConstraintViolationList.php b/src/Symfony/Component/Validator/ConstraintViolationList.php
@@ -158,4 +158,13 @@ public function offsetUnset($offset)
     {
         $this->remove($offset);
     }
+
+    public function getViolationByCode($code)
+    {
+        foreach ($this as $violation) {
+            if ($violation->getCode() === $code) {
+                return $violation;
+            }
+        }
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintViolationListTest.php b/src/Symfony/Component/Validator/Tests/ConstraintViolationListTest.php
@@ -127,8 +127,18 @@ public function testToString()
         $this->assertEquals($expected, (string) $this->list);
     }
 
-    protected function getViolation($message, $root = null, $propertyPath = null)
+    public function testGetViolationByCode()
     {
-        return new ConstraintViolation($message, $message, array(), $root, $propertyPath, null);
+        $code = 'code';
+        $violation = $this->getViolation('Error', null, null, $code);
+        $this->list = new ConstraintViolationList(array($violation));
+
+        $this->assertInstanceOf(ConstraintViolation::class, $this->list->getViolationByCode($code));
+        $this->assertNull($this->list->getViolationByCode('not-existent-code'));
+    }
+
+    protected function getViolation($message, $root = null, $propertyPath = null, $code = null)
+    {
+        return new ConstraintViolation($message, $message, array(), $root, $propertyPath, null, null, $code);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -158,4 +158,13 @@ public function offsetUnset($offset)`
`158`	`158`	`{`
`159`	`159`	`$this->remove($offset);`
`160`	`160`	`}`
	`161`	`+`
	`162`	`+ public function getViolationByCode($code)`
	`163`	`+ {`
	`164`	`+ foreach ($this as $violation) {`
	`165`	`+ if ($violation->getCode() === $code) {`
	`166`	`+ return $violation;`
	`167`	`+ }`
	`168`	`+ }`
	`169`	`+ }`
`161`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,18 @@ public function testToString()`
`127`	`127`	`$this->assertEquals($expected, (string) $this->list);`
`128`	`128`	`}`
`129`	`129`
`130`		`- protected function getViolation($message, $root = null, $propertyPath = null)`
	`130`	`+ public function testGetViolationByCode()`
`131`	`131`	`{`
`132`		`- return new ConstraintViolation($message, $message, array(), $root, $propertyPath, null);`
	`132`	`+ $code = 'code';`
	`133`	`+ $violation = $this->getViolation('Error', null, null, $code);`
	`134`	`+ $this->list = new ConstraintViolationList(array($violation));`
	`135`	`+`
	`136`	`+ $this->assertInstanceOf(ConstraintViolation::class, $this->list->getViolationByCode($code));`
	`137`	`+ $this->assertNull($this->list->getViolationByCode('not-existent-code'));`
	`138`	`+ }`
	`139`	`+`
	`140`	`+ protected function getViolation($message, $root = null, $propertyPath = null, $code = null)`
	`141`	`+ {`
	`142`	`+ return new ConstraintViolation($message, $message, array(), $root, $propertyPath, null, null, $code);`
`133`	`143`	`}`
`134`	`144`	`}`