minor #30912 Restore previous state for libxml option (greg0ire)

fabpot · fabpot · commit a815308bf66b · 2019-04-06T17:26:39.000+02:00
This PR was submitted for the master branch but it was merged into the 4.2 branch instead (closes #30912). Discussion ---------- Restore previous state for libxml option | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Whenever libxml_use_internal_errors() is called, the previous value for it should be restored. This used to be the case in this piece of code, but it was wrongly removed in e53bf58 , which has the nasty side effect of making the Validator component test suite break with this message: Validation failed: No DTD found! Commits ------- dde74aa Restore previous state for libxml option
diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -115,7 +115,7 @@ private function validate($content, $file = null)
             return ['file' => $file, 'valid' => true];
         }
 
-        libxml_use_internal_errors(true);
+        $internal = libxml_use_internal_errors(true);
 
         $document = new \DOMDocument();
         $document->loadXML($content);
@@ -143,6 +143,9 @@ private function validate($content, $file = null)
             ];
         }
 
+        libxml_clear_errors();
+        libxml_use_internal_errors($internal);
+
         return ['file' => $file, 'valid' => 0 === \count($errors), 'messages' => $errors];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private function validate($content, $file = null)`
`115`	`115`	`return ['file' => $file, 'valid' => true];`
`116`	`116`	`}`
`117`	`117`
`118`		`- libxml_use_internal_errors(true);`
	`118`	`+ $internal = libxml_use_internal_errors(true);`
`119`	`119`
`120`	`120`	`$document = new \DOMDocument();`
`121`	`121`	`$document->loadXML($content);`
`@@ -143,6 +143,9 @@ private function validate($content, $file = null)`
`143`	`143`	`];`
`144`	`144`	`}`
`145`	`145`
	`146`	`+ libxml_clear_errors();`
	`147`	`+ libxml_use_internal_errors($internal);`
	`148`	`+`
`146`	`149`	`return ['file' => $file, 'valid' => 0 === \count($errors), 'messages' => $errors];`
`147`	`150`	`}`
`148`	`151`