Skip to content

Commit 94bbc4b

Browse files
committed
Merge branch '2.5' into 2.6
* 2.5: fix dependency on ExtensionInterface over implementation [FrameworkBundle] forward error reporting level to insulated Client [Config] fix error handler restoration in test
2 parents 3ad3c1a + 0534abb commit 94bbc4b

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

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)