Skip to content

Commit 8d08224

Browse files
committed
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
2 parents 59fee0c + 02fa0bf commit 8d08224

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Tests/ export-ignore
2+
phpunit.xml.dist export-ignore

0 commit comments

Comments
 (0)