[ErrorHandler] Fix error caused by include + open_basedir

stlrnz · nicolas-grekas · commit 9ad7832acd16 · 2021-03-16T10:07:47.000+01:00
diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
@@ -352,7 +352,7 @@ private function include(string $name, array $context = []): string
         extract($context, \EXTR_SKIP);
         ob_start();
 
-        include file_exists($name) ? $name : __DIR__.'/../Resources/'.$name;
+        include is_file(\dirname(__DIR__).'/Resources/'.$name) ? \dirname(__DIR__).'/Resources/'.$name : $name;
 
         return trim(ob_get_clean());
     }

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ private function include(string $name, array $context = []): string`
`352`	`352`	`extract($context, \EXTR_SKIP);`
`353`	`353`	`ob_start();`
`354`	`354`
`355`		`- include file_exists($name) ? $name : __DIR__.'/../Resources/'.$name;`
	`355`	`+ include is_file(\dirname(__DIR__).'/Resources/'.$name) ? \dirname(__DIR__).'/Resources/'.$name : $name;`
`356`	`356`
`357`	`357`	`return trim(ob_get_clean());`
`358`	`358`	`}`