diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Form] Changed the default value of $flatten in Form::getErrors() to true

This commit is contained in:
Bernhard Schussek 2014-01-10 13:53:52 +01:00
parent a9268c4a99
commit 6b3fbb5905
7 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UPGRADE-2.5.md
View File

@ -41,6 +41,6 @@ Form
After:
```
public function getErrors($deep = false, $flatten = false)
public function getErrors($deep = false, $flatten = true)
{
```

6
UPGRADE-3.0.md
View File

@ -181,8 +181,8 @@ UPGRADE FROM 2.x to 3.0
and "csrf_token_id".
* The method `Form::getErrorsAsString()` was removed. Use `Form::getErrors()`
instead with the argument `$deep` set to true and cast the returned iterator
to a string (if not done implicitly by PHP).
instead with the argument `$deep` set to true and `$flatten` set to false
and cast the returned iterator to a string (if not done implicitly by PHP).
Before:
@ -193,7 +193,7 @@ UPGRADE FROM 2.x to 3.0
After:
```
echo $form->getErrors(true);
echo $form->getErrors(true, false);
```

2
src/Symfony/Component/Form/Button.php
View File

@ -184,7 +184,7 @@ class Button implements \IteratorAggregate, FormInterface
/**
* {@inheritdoc}
*/
public function getErrors($deep = false, $flatten = false)
public function getErrors($deep = false, $flatten = true)
{
$errors = array();

4
src/Symfony/Component/Form/Form.php
View File

@ -778,7 +778,7 @@ class Form implements \IteratorAggregate, FormInterface
/**
* {@inheritdoc}
*/
public function getErrors($deep = false, $flatten = false)
public function getErrors($deep = false, $flatten = true)
{
return new FormErrorIterator($this->errors, $this, $deep, $flatten);
}
@ -797,7 +797,7 @@ class Form implements \IteratorAggregate, FormInterface
*/
public function getErrorsAsString($level = 0)
{
return self::indent((string) $this->getErrors(true), $level);
return self::indent((string) $this->getErrors(true, false), $level);
}
/**

2
src/Symfony/Component/Form/FormErrorIterator.php
View File

@ -68,7 +68,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
* @param Boolean $flatten Whether to flatten the recursive list of
* errors into a flat list
*/
public function __construct(array &$errors, FormInterface $form, $deep = false, $flatten = false)
public function __construct(array &$errors, FormInterface $form, $deep = false, $flatten = true)
{
$this->errors = &$errors;
$this->form = $form;

2
src/Symfony/Component/Form/FormInterface.php
View File

@ -104,7 +104,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
* @since 2.5 Since version 2.5 this method returns a
* {@link FormErrorIterator} instance instead of an array
*/
public function getErrors($deep = false, $flatten = false);
public function getErrors($deep = false, $flatten = true);
/**
* Updates the form with default data.

48
src/Symfony/Component/Form/Tests/CompoundFormTest.php
View File

@ -872,6 +872,30 @@ class CompoundFormTest extends AbstractFormTest
$errors = $this->form->getErrors(true);
$this->assertSame(
"ERROR: Error 1\n".
"ERROR: Error 2\n".
"ERROR: Nested Error\n",
(string) $errors
);
$this->assertSame(
array($error1, $error2, $nestedError),
iterator_to_array($errors)
);
}
public function testGetErrorsDeepRecursive()
{
$this->form->addError($error1 = new FormError('Error 1'));
$this->form->addError($error2 = new FormError('Error 2'));
$childForm = $this->getBuilder('Child')->getForm();
$childForm->addError($nestedError = new FormError('Nested Error'));
$this->form->add($childForm);
$errors = $this->form->getErrors(true, false);
$this->assertSame(
"ERROR: Error 1\n".
"ERROR: Error 2\n".
@ -892,30 +916,6 @@ class CompoundFormTest extends AbstractFormTest
$this->assertSame($nestedError, $nestedErrorsAsArray[0]);
}
public function testGetErrorsDeepFlat()
{
$this->form->addError($error1 = new FormError('Error 1'));
$this->form->addError($error2 = new FormError('Error 2'));
$childForm = $this->getBuilder('Child')->getForm();
$childForm->addError($nestedError = new FormError('Nested Error'));
$this->form->add($childForm);
$errors = $this->form->getErrors(true, true);
$this->assertSame(
"ERROR: Error 1\n".
"ERROR: Error 2\n".
"ERROR: Nested Error\n",
(string) $errors
);
$this->assertSame(
array($error1, $error2, $nestedError),
iterator_to_array($errors)
);
}
// Basic cases are covered in SimpleFormTest
public function testCreateViewWithChildren()
{