bug #13075 [Config] fix error handler restoration in test (nicolas-grekas)

fabpot · fabpot · commit cad7f0e99c46 · 2014-12-23T18:31:59.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Config] fix error handler restoration in test | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 266afeb [Config] fix error handler restoration in test
diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -160,10 +160,17 @@ public function testLoadWrongEmptyXMLWithErrorHandler()
 
         $file = __DIR__.'/../Fixtures/foo.xml';
         try {
-            XmlUtils::loadFile($file);
-            $this->fail('An exception should have been raised');
-        } catch (\InvalidArgumentException $e) {
-            $this->assertEquals(sprintf('File %s does not contain valid XML, it is empty.', $file), $e->getMessage());
+            try {
+                XmlUtils::loadFile($file);
+                $this->fail('An exception should have been raised');
+            } catch (\InvalidArgumentException $e) {
+                $this->assertEquals(sprintf('File %s does not contain valid XML, it is empty.', $file), $e->getMessage());
+            }
+        } catch (\Exception $e) {
+            restore_error_handler();
+            error_reporting($errorReporting);
+
+            throw $e;
         }
 
         restore_error_handler();
