8000 Merge branch '2.3' into 2.5 · symfony/symfony@aaf4c84 · GitHub
[go: up one dir, main page]
Skip to content

Commit aaf4c84

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.5
* 2.3: [FrameworkBundle] forward error reporting level to insulated Client [Config] fix error handler restoration in test
2 parents 5e0ae26 + cad7f0e commit aaf4c84

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Client.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,13 @@ protected function getScript($request)
160160
$profilerCode = '$kernel->getContainer()->get(\'profiler\')->enable();';
161161
}
162162

163+
$errorReporting = error_reporting();
164+
163165
$code = <<<EOF
164166
<?php
165167
168+
error_reporting($errorReporting);
169+
166170
if ('$autoloader') {
167171
require_once '$autoloader';
168172
}

‎src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,17 @@ public function testLoadWrongEmptyXMLWithErrorHandler()
163163

164164
$file = __DIR__.'/../Fixtures/foo.xml';
165165
try {
166-
XmlUtils::loadFile($file);
167-
$this->fail('An exception should have been raised');
168-
} catch (\InvalidArgumentException $e) {
169-
$this->assertEquals(sprintf('File %s does not contain valid XML, it is empty.', $file), $e->getMessage());
166+
try {
167+
XmlUtils::loadFile($file);
168+
$this->fail('An exception should have been raised');
169+
} catch (\InvalidArgumentException $e) {
170+
$this->assertEquals(sprintf('File %s does not contain valid XML, it is empty.', $file), $e->getMessage());
171+
}
172+
} catch (\Exception $e) {
173+
restore_error_handler();
174+
error_reporting($errorReporting);
175+
176+
throw $e;
170177
}
171178

172179
restore_error_handler();

‎src/Symfony/Component/HttpKernel/Client.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,13 @@ protected function getScript($request)
102102
$r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\ClassLoader');
103103
$requirePath = str_replace("'", "\\'", $r->getFileName());
104104
$symfonyPath = str_replace("'", "\\'", realpath(__DIR__.'/../../..'));
105+
$errorReporting = error_reporting();
105106

106107
$code = <<<EOF
107108
<?php
108109
110+
error_reporting($errorReporting);
111+
109112
require_once '$requirePath';
110113
111114
\$loader = new Symfony\Component\ClassLoader\ClassLoader();

0 commit comments

Comments
 (0)
0