Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit c6568acc774cb51ba6afb4f77869548d22c1810b 2 parents 5565568 + 5467d51
@fabpot fabpot authored
View
2  .gitattributes
@@ -0,0 +1,2 @@
+Tests/ export-ignore
+phpunit.xml.dist export-ignore
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.