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
SerhiyMytrovtsiy · Jul 12, 2015 · 0f7fa75 · 0f7fa75
2 parents 05dce7b + 56dca00
commit 0f7fa75
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+Tests/ export-ignore
+phpunit.xml.dist export-ignore
diff --git a/Loader/XliffFileLoader.php b/Loader/XliffFileLoader.php
@@ -54,7 +54,7 @@ public function load($resource, $locale, $domain = 'messages')
      *
      * @param string $file
      *
-     * @return SimpleXMLElement
+     * @return \SimpleXMLElement
      */
     private function parseFile($file)
     {
@@ -109,7 +109,7 @@ private function parseFile($file)
     /**
      * Returns the XML errors of the internal XML parser
      *
-     * @return array  An array of errors
+     * @return array An array of errors
      */
     private function getXmlErrors($internalErrors)
     {

diff --git a/MessageSelector.php b/MessageSelector.php
@@ -44,7 +44,7 @@ class MessageSelector
      *
      * @return string
      *
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      *
      * @api
      */

diff --git a/Translator.php b/Translator.php
@@ -73,6 +73,8 @@ public function addLoader($format, LoaderInterface $loader)
     public function addResource($format, $resource, $locale, $domain = 'messages')
     {
         $this->resources[$locale][] = array($format, $resource, $domain);
+
+        unset($this->catalogues[$locale]);
     }
 
     /**