Merge branch '7.0' into 7.1

xabbuh · xabbuh · commit 3f7ed9e3d074 · 2024-04-30T11:52:30.000+02:00
* 7.0:
  fix merge
diff --git a/Command/DebugCommand.php b/Command/DebugCommand.php
@@ -128,7 +128,7 @@ private function getVariables(array $envFiles, ?string $nameFilter): array
                 continue;
             }
 
-            $realValue = $_SERVER[$var];
+            $realValue = $_SERVER[$var] ?? '';
             $varDetails = [$var, '<fg=green>'.OutputFormatter::escape($realValue).'</>'];
             $varSeen = !isset($dotenvVars[$var]);
 

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private function getVariables(array $envFiles, ?string $nameFilter): array`
`128`	`128`	`continue;`
`129`	`129`	`}`
`130`	`130`
`131`		`- $realValue = $_SERVER[$var];`
	`131`	`+ $realValue = $_SERVER[$var] ?? '';`
`132`	`132`	`$varDetails = [$var, '<fg=green>'.OutputFormatter::escape($realValue).'</>'];`
`133`	`133`	`$varSeen = !isset($dotenvVars[$var]);`
`134`	`134`