bug #48624 [ErrorHandler][HttpKernel] Fix reading the SYMFONY_IDE env var (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 7ed7e922e620 · 2022-12-13T10:40:22.000+01:00
This PR was merged into the 6.1 branch. Discussion ---------- [ErrorHandler][HttpKernel] Fix reading the SYMFONY_IDE env var | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- ac52802 [HttpKernel][ErrorHandler] Fix reading the SYMFONY_IDE env var
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,6 +13,7 @@
         <ini name="intl.default_locale" value="en" />
         <ini name="intl.error_level" value="0" />
         <ini name="memory_limit" value="-1" />
+        <env name="SYMFONY_IDE" value="" force="true" />
         <env name="DUMP_LIGHT_ARRAY" value="" />
         <env name="DUMP_STRING_LENGTH" value="" />
         <env name="LDAP_HOST" value="localhost" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist
@@ -10,6 +10,7 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <env name="SYMFONY_IDE" value="" force="true" />
         <env name="REDIS_HOST" value="localhost" />
         <env name="MEMCACHED_HOST" value="localhost" />
     </php>
diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
@@ -50,7 +50,7 @@ public function __construct(bool|callable $debug = false, string $charset = null
     {
         $this->debug = \is_bool($debug) ? $debug : $debug(...);
         $this->charset = $charset ?: (\ini_get('default_charset') ?: 'UTF-8');
-        $fileLinkFormat ??= $_SERVER['SYMFONY_IDE'] ?? null;
+        $fileLinkFormat ??= $_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? null;
         $this->fileLinkFormat = \is_string($fileLinkFormat)
             ? (ErrorRendererInterface::IDE_LINK_FORMATS[$fileLinkFormat] ?? $fileLinkFormat ?: false)
             : ($fileLinkFormat ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: false);
diff --git a/src/Symfony/Component/ErrorHandler/phpunit.xml.dist b/src/Symfony/Component/ErrorHandler/phpunit.xml.dist
@@ -10,6 +10,7 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <env name="SYMFONY_IDE" value="" force="true" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -35,7 +35,8 @@ class FileLinkFormatter
      */
     public function __construct(string|array $fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, string|\Closure $urlFormat = null)
     {
-        $fileLinkFormat ??= $_SERVER['SYMFONY_IDE'] ?? '';
+        $fileLinkFormat ??= $_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? '';
+
         if (!\is_array($fileLinkFormat) && $fileLinkFormat = (ErrorRendererInterface::IDE_LINK_FORMATS[$fileLinkFormat] ?? $fileLinkFormat) ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: false) {
             $i = strpos($f = $fileLinkFormat, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: \strlen($f);
             $fileLinkFormat = [substr($f, 0, $i)] + preg_split('/&([^>]++)>/', substr($f, $i), -1, \PREG_SPLIT_DELIM_CAPTURE);
diff --git a/src/Symfony/Component/HttpKernel/phpunit.xml.dist b/src/Symfony/Component/HttpKernel/phpunit.xml.dist
@@ -10,6 +10,7 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <env name="SYMFONY_IDE" value="" force="true" />
     </php>
 
     <testsuites>

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`>`
`11`	`11`	`<php>`
`12`	`12`	`<ini name="error_reporting" value="-1" />`
	`13`	`+ <env name="SYMFONY_IDE" value="" force="true" />`
`13`	`14`	`<env name="REDIS_HOST" value="localhost" />`
`14`	`15`	`<env name="MEMCACHED_HOST" value="localhost" />`
`15`	`16`	`</php>`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function __construct(bool\|callable $debug = false, string $charset = null`
`50`	`50`	`{`
`51`	`51`	`$this->debug = \is_bool($debug) ? $debug : $debug(...);`
`52`	`52`	`$this->charset = $charset ?: (\ini_get('default_charset') ?: 'UTF-8');`
`53`		`- $fileLinkFormat ??= $_SERVER['SYMFONY_IDE'] ?? null;`
	`53`	`+ $fileLinkFormat ??= $_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? null;`
`54`	`54`	`$this->fileLinkFormat = \is_string($fileLinkFormat)`
`55`	`55`	`? (ErrorRendererInterface::IDE_LINK_FORMATS[$fileLinkFormat] ?? $fileLinkFormat ?: false)`
`56`	`56`	`: ($fileLinkFormat ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: false);`