diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php
index 795404b417da..2fd9306f3012 100644
--- a/src/Symfony/Component/Form/Button.php
+++ b/src/Symfony/Component/Form/Button.php
@@ -186,9 +186,7 @@ public function all()
*/
public function getErrors($deep = false, $flatten = true)
{
- $errors = array();
-
- return new FormErrorIterator($errors, $this, $deep, $flatten);
+ return new FormErrorIterator($this, array());
}
/**
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index e05adda3e769..a5f98c16f52f 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -780,7 +780,33 @@ public function getClickedButton()
*/
public function getErrors($deep = false, $flatten = true)
{
- return new FormErrorIterator($this->errors, $this, $deep, $flatten);
+ $errors = $this->errors;
+
+ // Copy the errors of nested forms to the $errors array
+ if ($deep) {
+ foreach ($this as $child) {
+ /** @var FormInterface $child */
+ if ($child->isSubmitted() && $child->isValid()) {
+ continue;
+ }
+
+ $iterator = $child->getErrors(true, $flatten);
+
+ if (0 === count($iterator)) {
+ continue;
+ }
+
+ if ($flatten) {
+ foreach ($iterator as $error) {
+ $errors[] = $error;
+ }
+ } else {
+ $errors[] = $iterator;
+ }
+ }
+ }
+
+ return new FormErrorIterator($this, $errors);
}
/**
diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php
index 32ddf2e4850d..bc2bdb1e506d 100644
--- a/src/Symfony/Component/Form/FormErrorIterator.php
+++ b/src/Symfony/Component/Form/FormErrorIterator.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Form;
+use Symfony\Component\Form\Exception\InvalidArgumentException;
use Symfony\Component\Form\Exception\OutOfBoundsException;
use Symfony\Component\Form\Exception\BadMethodCallException;
@@ -44,38 +45,33 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
private $form;
/**
- * @var Boolean
+ * @var FormError[]|FormErrorIterator[]
*/
- private $deep;
-
- /**
- * @var Boolean
- */
- private $flatten;
-
- /**
- * @var array
- */
- private $elements;
+ private $errors;
/**
* Creates a new iterator.
*
- * @param array $errors The iterated errors
- * @param FormInterface $form The form the errors belong to
- * @param Boolean $deep Whether to include the errors of child
- * forms
- * @param Boolean $flatten Whether to flatten the recursive list of
- * errors into a flat list
+ * @param FormInterface $form The erroneous form
+ * @param array $errors The form errors
+ *
+ * @throws InvalidArgumentException If the errors are invalid
*/
- public function __construct(array &$errors, FormInterface $form, $deep = false, $flatten = true)
+ public function __construct(FormInterface $form, array $errors)
{
- $this->errors = &$errors;
- $this->form = $form;
- $this->deep = $deep;
- $this->flatten = $flatten;
+ foreach ($errors as $error) {
+ if (!($error instanceof FormError || $error instanceof self)) {
+ throw new InvalidArgumentException(sprintf(
+ 'The errors must be instances of '.
+ '"\Symfony\Component\Form\FormError" or "%s". Got: "%s".',
+ __CLASS__,
+ is_object($error) ? get_class($error) : gettype($error)
+ ));
+ }
+ }
- $this->rewind();
+ $this->form = $form;
+ $this->errors = $errors;
}
/**
@@ -87,13 +83,13 @@ public function __toString()
{
$string = '';
- foreach ($this->elements as $element) {
- if ($element instanceof FormError) {
- $string .= 'ERROR: '.$element->getMessage()."\n";
+ foreach ($this->errors as $error) {
+ if ($error instanceof FormError) {
+ $string .= 'ERROR: '.$error->getMessage()."\n";
} else {
- /** @var $element FormErrorIterator */
- $string .= $element->form->getName().":\n";
- $string .= self::indent((string) $element);
+ /** @var $error FormErrorIterator */
+ $string .= $error->form->getName().":\n";
+ $string .= self::indent((string) $error);
}
}
@@ -113,12 +109,12 @@ public function getForm()
/**
* Returns the current element of the iterator.
*
- * @return FormError|FormErrorIterator An error or an iterator for nested
- * errors.
+ * @return FormError|FormErrorIterator An error or an iterator containing
+ * nested errors.
*/
public function current()
{
- return current($this->elements);
+ return current($this->errors);
}
/**
@@ -126,7 +122,7 @@ public function current()
*/
public function next()
{
- next($this->elements);
+ next($this->errors);
}
/**
@@ -136,7 +132,7 @@ public function next()
*/
public function key()
{
- return key($this->elements);
+ return key($this->errors);
}
/**
@@ -146,7 +142,7 @@ public function key()
*/
public function valid()
{
- return null !== key($this->elements);
+ return null !== key($this->errors);
}
/**
@@ -157,32 +153,7 @@ public function valid()
*/
public function rewind()
{
- $this->elements = $this->errors;
-
- if ($this->deep) {
- foreach ($this->form as $child) {
- /** @var FormInterface $child */
- if ($child->isSubmitted() && $child->isValid()) {
- continue;
- }
-
- $iterator = $child->getErrors(true, $this->flatten);
-
- if (0 === count($iterator)) {
- continue;
- }
-
- if ($this->flatten) {
- foreach ($iterator as $error) {
- $this->elements[] = $error;
- }
- } else {
- $this->elements[] = $iterator;
- }
- }
- }
-
- reset($this->elements);
+ reset($this->errors);
}
/**
@@ -194,7 +165,7 @@ public function rewind()
*/
public function offsetExists($position)
{
- return isset($this->elements[$position]);
+ return isset($this->errors[$position]);
}
/**
@@ -208,11 +179,11 @@ public function offsetExists($position)
*/
public function offsetGet($position)
{
- if (!isset($this->elements[$position])) {
+ if (!isset($this->errors[$position])) {
throw new OutOfBoundsException('The offset '.$position.' does not exist.');
}
- return $this->elements[$position];
+ return $this->errors[$position];
}
/**
@@ -243,7 +214,7 @@ public function offsetUnset($position)
*/
public function hasChildren()
{
- return current($this->elements) instanceof self;
+ return current($this->errors) instanceof self;
}
/**
@@ -251,7 +222,7 @@ public function hasChildren()
*/
public function getChildren()
{
- return current($this->elements);
+ return current($this->errors);
}
/**
@@ -273,7 +244,7 @@ public function getChildren()
*/
public function count()
{
- return count($this->elements);
+ return count($this->errors);
}
/**
@@ -285,14 +256,14 @@ public function count()
*/
public function seek($position)
{
- if (!isset($this->elements[$position])) {
+ if (!isset($this->errors[$position])) {
throw new OutOfBoundsException('The offset '.$position.' does not exist.');
}
- reset($this->elements);
+ reset($this->errors);
- while ($position !== key($this->elements)) {
- next($this->elements);
+ while ($position !== key($this->errors)) {
+ next($this->errors);
}
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy