diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-05-06 10:37:50 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-05-06 10:37:50 +0200 |
| commit | 30928a37835ca43141f13fa58333600323cc49b5 (patch) | |
| tree | 55df0f11611e97a32892ecd756677ead733b3d61 /Tests/Core/Encoder | |
| parent | 80e9159c0c5cc108d799b7b80099565c62e3201f (diff) | |
| parent | b4ee7b37ddc38e65dde39b8c8a6b7b78fae6959b (diff) | |
| download | symfony-security-30928a37835ca43141f13fa58333600323cc49b5.zip symfony-security-30928a37835ca43141f13fa58333600323cc49b5.tar.gz symfony-security-30928a37835ca43141f13fa58333600323cc49b5.tar.bz2 | |
Merge branch '2.1' into 2.2
* 2.1:
added additional tests to cover invalid argument exceptions in OutputFormatterStyle component
added a missing check for the provider key
[Validator] fixed wrong URL for XSD
[Form] Fixed transform()/reverseTransform() to always throw TransformationFailedExceptions
[Form] Fixed: String validation groups are never interpreted as callbacks
if the repository method returns an array ensure that it's internal poin...
Fix wrong method in findTaggedServiceIds(), add example to docblock.
Conflicts:
src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php
src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php
Diffstat (limited to 'Tests/Core/Encoder')
0 files changed, 0 insertions, 0 deletions