Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 5467d51dafa4409fe9ed0f7256d9a5d2d8077dbd 2 parents 0331425 + ec538b4
@fabpot fabpot authored
View
4 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)
{
View
2  MessageSelector.php
@@ -44,7 +44,7 @@ class MessageSelector
*
* @return string
*
- * @throws InvalidArgumentException
+ * @throws \InvalidArgumentException
*
* @api
*/
View
2  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]);
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.