diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-10-06 21:57:59 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-10-06 21:57:59 +0200 |
| commit | ee972b21244667e27d2d7aae248756e7cf0f5487 (patch) | |
| tree | 4fcb0777b80d9da7a68fd66091b954f766eb869c | |
| parent | 2cdd8e98e2f39cc696f7bf7ef3cd39083f1fd9b6 (diff) | |
| parent | 8a9136a560d3af7c3f61093ec45d47c61eb41978 (diff) | |
| download | symfony-security-ee972b21244667e27d2d7aae248756e7cf0f5487.zip symfony-security-ee972b21244667e27d2d7aae248756e7cf0f5487.tar.gz symfony-security-ee972b21244667e27d2d7aae248756e7cf0f5487.tar.bz2 | |
Merge branch '2.1'
* 2.1:
fixed CS
added doc comments
added doc comments
[Validator] Updated swedish translation
Update src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
[2.1] Exclude tests from zips via gitattributes
[HttpKernel][Translator] Fixed type-hints
Updated lithuanian validation translation
[DomCrawler] Allows using multiselect through Form::setValues().
[Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/Translation#1)
Unit test for patched method OptionsResolver::validateOptionValues().
validateOptionValues throw a notice if an allowed value is set and the corresponding option isn't.
[Form] Hardened code of ViolationMapper against errors
[HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.
[Form] Fixed negative index access in PropertyPathBuilder
Update src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf
Conflicts:
src/Symfony/Component/DomCrawler/Form.php
src/Symfony/Component/Process/Process.php
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e742c9b --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +Tests/ export-ignore +phpunit.xml.dist export-ignore |