diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Fabien Potencier 2014-12-23 18:31:59 +01:00
commit cad7f0e99c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
View File

@ -160,10 +160,17 @@ class XmlUtilsTest extends \PHPUnit_Framework_TestCase
$file = __DIR__.'/../Fixtures/foo.xml'; $file = __DIR__.'/../Fixtures/foo.xml';
try { try {
XmlUtils::loadFile($file); try {
$this->fail('An exception should have been raised'); XmlUtils::loadFile($file);
} catch (\InvalidArgumentException $e) { $this->fail('An exception should have been raised');
$this->assertEquals(sprintf('File %s does not contain valid XML, it is empty.', $file), $e->getMessage()); } 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(); restore_error_handler();