[Translation] Fix the string casting in the XliffFileLoader

symfony · Aug 26, 2015 · b856f62 · b856f62
1 parent fed77a3
commit b856f62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -53,7 +53,7 @@ public function load($resource, $locale, $domain = 'messages')
             }
 
             $source = isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source;
-            $target = (string) isset($translation->target) ? $translation->target : $source;
+            $target = (string) (isset($translation->target) ? $translation->target : $source);
 
             // If the xlf file has another encoding specified, try to convert it because
             // simple_xml will always return utf-8 encoded values

diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -25,6 +25,7 @@ public function testLoad()
         $this->assertEquals('en', $catalogue->getLocale());
         $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
         $this->assertSame(array(), libxml_get_errors());
+        $this->assertContainsOnly('string', $catalogue->all('domain1'));
     }
 
     public function testLoadWithInternalErrorsEnabled()