diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-10 22:24:28 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-10 22:24:28 +0200 |
| commit | 21e1cf7af986cce991eb77460765a98181936815 (patch) | |
| tree | 762b8a39a0ee2c8c6a8874dc1e4c9f18b584eb40 /Tests/Core/Encoder/BCryptPasswordEncoderTest.php | |
| parent | 73e267b8033bc9da70dc4cd0e51f9e77278aecff (diff) | |
| parent | 390b3dbf915f9f5b0d2d8b591f37057d60a37879 (diff) | |
| download | symfony-security-21e1cf7af986cce991eb77460765a98181936815.zip symfony-security-21e1cf7af986cce991eb77460765a98181936815.tar.gz symfony-security-21e1cf7af986cce991eb77460765a98181936815.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
Fixed docblock in UserInterface::getSalt()
[Process] Fix #8970 : read output once the process is finished, enable pipe tests on Windows
[DoctrineBridge] Improved test coverage of EntityChoiceList
[Form] Improved test coverage of ChoiceList classes
[Form] Fixed expanded choice field to be marked invalid when unknown choices are submitted
[Form] Fixed ChoiceList::get*By*() methods to preserve order and array keys
[Form] Removed usage of the ChoiceList::getIndicesFor*() methods where they don't offer any performance benefit
[HttpKernel] made code more reliable
Conflicts:
src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php
src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php
src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
src/Symfony/Component/Form/Form.php
src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
Diffstat (limited to 'Tests/Core/Encoder/BCryptPasswordEncoderTest.php')
0 files changed, 0 insertions, 0 deletions