Set back libxml settings after testings.

SpacePossum · SpacePossum · commit 29d696944cf4 · 2015-10-29T11:26:44.000+01:00
diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -63,11 +63,14 @@ public function testLoadFile()
 
     public function testLoadFileWithInternalErrorsEnabled()
     {
-        libxml_use_internal_errors(true);
+        $internalErrors = 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());
+
+        libxml_clear_errors();
+        libxml_use_internal_errors($internalErrors);
     }
 
     /**
@@ -144,7 +147,7 @@ public function getDataForPhpize()
     public function testLoadEmptyXmlFile()
     {
         $file = __DIR__.'/../Fixtures/foo.xml';
-        $this->setExpectedException('InvalidArgumentException', 'File '.$file.' does not contain valid XML, it is empty.');
+        $this->setExpectedException('InvalidArgumentException', sprintf('File %s does not contain valid XML, it is empty.', $file));
         XmlUtils::loadFile($file);
     }
 
diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -30,7 +30,7 @@ public function testLoad()
 
     public function testLoadWithInternalErrorsEnabled()
     {
-        libxml_use_internal_errors(true);
+        $internalErrors = libxml_use_internal_errors(true);
 
         $this->assertSame(array(), libxml_get_errors());
 
@@ -41,6 +41,9 @@ public function testLoadWithInternalErrorsEnabled()
         $this->assertEquals('en', $catalogue->getLocale());
         $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
         $this->assertSame(array(), libxml_get_errors());
+
+        libxml_clear_errors();
+        libxml_use_internal_errors($internalErrors);
     }
 
     public function testLoadWithResname()

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,14 @@ public function testLoadFile()`
`63`	`63`
`64`	`64`	`public function testLoadFileWithInternalErrorsEnabled()`
`65`	`65`	`{`
`66`		`- libxml_use_internal_errors(true);`
	`66`	`+ $internalErrors = libxml_use_internal_errors(true);`
`67`	`67`
`68`	`68`	`$this->assertSame(array(), libxml_get_errors());`
`69`	`69`	`$this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml'));`
`70`	`70`	`$this->assertSame(array(), libxml_get_errors());`
	`71`	`+`
	`72`	`+ libxml_clear_errors();`
	`73`	`+ libxml_use_internal_errors($internalErrors);`
`71`	`74`	`}`
`72`	`75`
`73`	`76`	`/**`
`@@ -144,7 +147,7 @@ public function getDataForPhpize()`
`144`	`147`	`public function testLoadEmptyXmlFile()`
`145`	`148`	`{`
`146`	`149`	`$file = __DIR__.'/../Fixtures/foo.xml';`
`147`		`- $this->setExpectedException('InvalidArgumentException', 'File '.$file.' does not contain valid XML, it is empty.');`
	`150`	`+ $this->setExpectedException('InvalidArgumentException', sprintf('File %s does not contain valid XML, it is empty.', $file));`
`148`	`151`	`XmlUtils::loadFile($file);`
`149`	`152`	`}`
`150`	`153`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function testLoad()`
`30`	`30`
`31`	`31`	`public function testLoadWithInternalErrorsEnabled()`
`32`	`32`	`{`
`33`		`- libxml_use_internal_errors(true);`
	`33`	`+ $internalErrors = libxml_use_internal_errors(true);`
`34`	`34`
`35`	`35`	`$this->assertSame(array(), libxml_get_errors());`
`36`	`36`
`@@ -41,6 +41,9 @@ public function testLoadWithInternalErrorsEnabled()`
`41`	`41`	`$this->assertEquals('en', $catalogue->getLocale());`
`42`	`42`	`$this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());`
`43`	`43`	`$this->assertSame(array(), libxml_get_errors());`
	`44`	`+`
	`45`	`+ libxml_clear_errors();`
	`46`	`+ libxml_use_internal_errors($internalErrors);`
`44`	`47`	`}`
`45`	`48`
`46`	`49`	`public function testLoadWithResname()`