Merge branch '2.0' into 2.1

* 2.0: fixed CS added doc comments [HttpKernel][Translator] Fixed type-hints [Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/translation#1) [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order. Conflicts: src/Symfony/Component/Process/Process.php tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php
SerhiyMytrovtsiy · Jul 12, 2015 · 56dca00 · 56dca00
2 parents 3dd7a2d + b78f2ea
commit 56dca00
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
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]);
     }
 
     /**