apply some fixes.

aitboudad · aitboudad · commit ae4536f94574 · 2015-09-07T18:17:00.000Z
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -60,7 +60,7 @@ private function extract($resource, MessageCatalogue $catalogue, $domain)
         }
 
         $xliffVersion = $this->getVersionNumber($dom);
-        $this->validateSchema($xliffVersion, $dom, $this->getSchema($xliffVersion, $dom));
+        $this->validateSchema($xliffVersion, $dom, $this->getSchema($xliffVersion));
 
         if ('1.2' === $xliffVersion) {
             $this->extractXliff1($dom, $catalogue, $domain);
@@ -159,6 +159,7 @@ private function utf8ToCharset($content, $encoding = null)
     }
 
     /**
+     * @param string $file
      * @param \DOMDocument $dom
      * @param string       $schema source of the schema
      *
@@ -178,10 +179,7 @@ private function validateSchema($file, \DOMDocument $dom, $schema)
         libxml_use_internal_errors($internalErrors);
     }
 
-    /**
-     * @return string
-     */
-    private function getSchema($xliffVersion, $dom)
+    private function getSchema($xliffVersion)
     {
         if ('1.2' === $xliffVersion) {
             $schemaSource = file_get_contents(__DIR__.'/schema/dic/xliff-core/xliff-core-1.2-strict.xsd');
diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -162,6 +162,7 @@ public function testLoadVersion2()
 
         $domains = $catalogue->all();
         $this->assertCount(3, $domains['domain1']);
+        $this->assertContainsOnly('string', $catalogue->all('domain1'));
 
         // Notes aren't assigned to specific segments, but to whole units, so there's no way to do a mapping
         $this->assertEmpty($catalogue->getMetadata());

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private function extract($resource, MessageCatalogue $catalogue, $domain)`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`$xliffVersion = $this->getVersionNumber($dom);`
`63`		`- $this->validateSchema($xliffVersion, $dom, $this->getSchema($xliffVersion, $dom));`
	`63`	`+ $this->validateSchema($xliffVersion, $dom, $this->getSchema($xliffVersion));`
`64`	`64`
`65`	`65`	`if ('1.2' === $xliffVersion) {`
`66`	`66`	`$this->extractXliff1($dom, $catalogue, $domain);`
`@@ -159,6 +159,7 @@ private function utf8ToCharset($content, $encoding = null)`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`/**`
	`162`	`+ * @param string $file`
`162`	`163`	`* @param \DOMDocument $dom`
`163`	`164`	`* @param string $schema source of the schema`
`164`	`165`	`*`
`@@ -178,10 +179,7 @@ private function validateSchema($file, \DOMDocument $dom, $schema)`
`178`	`179`	`libxml_use_internal_errors($internalErrors);`
`179`	`180`	`}`
`180`	`181`
`181`		`- /**`
`182`		`- * @return string`
`183`		`- */`
`184`		`- private function getSchema($xliffVersion, $dom)`
	`182`	`+ private function getSchema($xliffVersion)`
`185`	`183`	`{`
`186`	`184`	`if ('1.2' === $xliffVersion) {`
`187`	`185`	`$schemaSource = file_get_contents(__DIR__.'/schema/dic/xliff-core/xliff-core-1.2-strict.xsd');`