feature #48976 [ErrorHandler] try to read SYMFONY_PATCH_TYPE_DECLARATIONS from superglobal arrays too (xabbuh)

fabpot · fabpot · commit d4c27d91723c · 2023-01-14T12:28:06.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [ErrorHandler] try to read SYMFONY_PATCH_TYPE_DECLARATIONS from superglobal arrays too | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | Fix #48872 | License | MIT | Doc PR | Commits ------- ef7e6b1 try to read SYMFONY_PATCH_TYPE_DECLARATIONS from superglobal arrays too
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -134,7 +134,7 @@ public function __construct(callable $classLoader)
     {
         $this->classLoader = $classLoader;
         $this->isFinder = \is_array($classLoader) && method_exists($classLoader[0], 'findFile');
-        parse_str(getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') ?: '', $this->patchTypes);
+        parse_str($_ENV['SYMFONY_PATCH_TYPE_DECLARATIONS'] ?? $_SERVER['SYMFONY_PATCH_TYPE_DECLARATIONS'] ?? getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') ?: '', $this->patchTypes);
         $this->patchTypes += [
             'force' => null,
             'php' => \PHP_MAJOR_VERSION.'.'.\PHP_MINOR_VERSION,

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public function __construct(callable $classLoader)`
`134`	`134`	`{`
`135`	`135`	`$this->classLoader = $classLoader;`
`136`	`136`	`$this->isFinder = \is_array($classLoader) && method_exists($classLoader[0], 'findFile');`
`137`		`- parse_str(getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') ?: '', $this->patchTypes);`
	`137`	`+ parse_str($_ENV['SYMFONY_PATCH_TYPE_DECLARATIONS'] ?? $_SERVER['SYMFONY_PATCH_TYPE_DECLARATIONS'] ?? getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') ?: '', $this->patchTypes);`
`138`	`138`	`$this->patchTypes += [`
`139`	`139`	`'force' => null,`
`140`	`140`	`'php' => \PHP_MAJOR_VERSION.'.'.\PHP_MINOR_VERSION,`