bug #11908 [Translation] [Config] Clear libxml errors after parsing xliff file (pulzarraider)

fabpot · fabpot · commit 3a3fb05cdf50 · 2014-09-23T07:15:05.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [Translation] [Config] Clear libxml errors after parsing xliff file | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - If libxml_use_internal_errors is set to `true` before parsing xliff file, the libxml errors are not cleared correctly. An error `Validation failed: no DTD found !` occurs in libxml errors after parsing and it's available outside the xliff parser (can break other functionality that use `libxml_get_errors` function). Commits ------- fab61ef [Translation] [Config] Clear libxml errors after parsing XML file
diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -58,6 +58,16 @@ public function testLoadFile()
         }
 
         $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile($fixtures.'valid.xml', array($mock, 'validate')));
+        $this->assertSame(array(), libxml_get_errors());
+    }
+
+    public function testLoadFileWithInternalErrorsEnabled()
+    {
+        libxml_use_internal_errors(true);
+
+        $this->assertSame(array(), libxml_get_errors());
+        $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml'));
+        $this->assertSame(array(), libxml_get_errors());
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -31,7 +31,7 @@ private function __construct()
     /**
      * Loads an XML file.
      *
-     * @param string $file                      An XML file path
+     * @param string          $file             An XML file path
      * @param string|callable $schemaOrCallable An XSD schema file path or callable
      *
      * @return \DOMDocument
@@ -95,10 +95,11 @@ public static function loadFile($file, $schemaOrCallable = null)
                 }
                 throw new \InvalidArgumentException(implode("\n", $messages), 0, $e);
             }
-
-            libxml_use_internal_errors($internalErrors);
         }
 
+        libxml_clear_errors();
+        libxml_use_internal_errors($internalErrors);
+
         return $dom;
     }
 
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -116,6 +116,7 @@ private function parseFile($file)
 
         $dom->normalizeDocument();
 
+        libxml_clear_errors();
         libxml_use_internal_errors($internalErrors);
 
         return array(simplexml_import_dom($dom), strtoupper($dom->encoding));
@@ -124,7 +125,7 @@ private function parseFile($file)
     /**
      * Returns the XML errors of the internal XML parser
      *
-     * @param bool    $internalErrors
+     * @param bool $internalErrors
      *
      * @return array An array of errors
      */
diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -31,6 +31,22 @@ public function testLoad()
 
         $this->assertEquals('en', $catalogue->getLocale());
         $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertSame(array(), libxml_get_errors());
+    }
+
+    public function testLoadWithInternalErrorsEnabled()
+    {
+        libxml_use_internal_errors(true);
+
+        $this->assertSame(array(), libxml_get_errors());
+
+        $loader = new XliffFileLoader();
+        $resource = __DIR__.'/../fixtures/resources.xlf';
+        $catalogue = $loader->load($resource, 'en', 'domain1');
+
+        $this->assertEquals('en', $catalogue->getLocale());
+        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertSame(array(), libxml_get_errors());
     }
 
     public function testLoadWithResname()

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ private function __construct()`
`31`	`31`	`/**`
`32`	`32`	`* Loads an XML file.`
`33`	`33`	`*`
`34`		`- * @param string $file An XML file path`
	`34`	`+ * @param string $file An XML file path`
`35`	`35`	`* @param string\|callable $schemaOrCallable An XSD schema file path or callable`
`36`	`36`	`*`
`37`	`37`	`* @return \DOMDocument`
`@@ -95,10 +95,11 @@ public static function loadFile($file, $schemaOrCallable = null)`
`95`	`95`	`}`
`96`	`96`	`throw new \InvalidArgumentException(implode("\n", $messages), 0, $e);`
`97`	`97`	`}`
`98`		`-`
`99`		`- libxml_use_internal_errors($internalErrors);`
`100`	`98`	`}`
`101`	`99`
	`100`	`+ libxml_clear_errors();`
	`101`	`+ libxml_use_internal_errors($internalErrors);`
	`102`	`+`
`102`	`103`	`return $dom;`
`103`	`104`	`}`
`104`	`105`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ private function parseFile($file)`
`116`	`116`
`117`	`117`	`$dom->normalizeDocument();`
`118`	`118`
	`119`	`+ libxml_clear_errors();`
`119`	`120`	`libxml_use_internal_errors($internalErrors);`
`120`	`121`
`121`	`122`	`return array(simplexml_import_dom($dom), strtoupper($dom->encoding));`
`@@ -124,7 +125,7 @@ private function parseFile($file)`
`124`	`125`	`/**`
`125`	`126`	`* Returns the XML errors of the internal XML parser`
`126`	`127`	`*`
`127`		`- * @param bool $internalErrors`
	`128`	`+ * @param bool $internalErrors`
`128`	`129`	`*`
`129`	`130`	`* @return array An array of errors`
`130`	`131`	`*/`