bug #13081 [FrameworkBundle] forward error reporting level to insulated Client (nicolas-grekas)

fabpot · fabpot · commit e2762f69c59a · 2014-12-23T09:09:12.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [FrameworkBundle] forward error reporting level to insulated Client | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Especially if deprecation notices are silenced on the main php instance, we should also silence them in the insulated Client Commits ------- d82e062 [FrameworkBundle] forward error reporting level to insulated Client
diff --git a/src/Symfony/Bundle/FrameworkBundle/Client.php b/src/Symfony/Bundle/FrameworkBundle/Client.php
@@ -160,9 +160,13 @@ protected function getScript($request)
             $profilerCode = '$kernel->getContainer()->get(\'profiler\')->enable();';
         }
 
+        $errorReporting = error_reporting();
+
         $code = <<<EOF
 <?php
 
+error_reporting($errorReporting);
+
 if ('$autoloader') {
     require_once '$autoloader';
 }
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
@@ -102,10 +102,13 @@ protected function getScript($request)
         $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\ClassLoader');
         $requirePath = str_replace("'", "\\'", $r->getFileName());
         $symfonyPath = str_replace("'", "\\'", realpath(__DIR__.'/../../..'));
+        $errorReporting = error_reporting();
 
         $code = <<<EOF
 <?php
 
+error_reporting($errorReporting);
+
 require_once '$requirePath';
 
 \$loader = new Symfony\Component\ClassLoader\ClassLoader();

Original file line number	Diff line number	Diff line change
`@@ -160,9 +160,13 @@ protected function getScript($request)`
`160`	`160`	`$profilerCode = '$kernel->getContainer()->get(\'profiler\')->enable();';`
`161`	`161`	`}`
`162`	`162`
	`163`	`+ $errorReporting = error_reporting();`
	`164`	`+`
`163`	`165`	`$code = <<<EOF`
`164`	`166`	`<?php`
`165`	`167`
	`168`	`+error_reporting($errorReporting);`
	`169`	`+`
`166`	`170`	`if ('$autoloader') {`
`167`	`171`	`require_once '$autoloader';`
`168`	`172`	`}`