Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit b34cdbc9c5e7 · 2023-04-18T15:56:57.000+02:00
* 5.4:
  CS fix
  [HttpKernel] Tests for DataCollector
  for #49320
diff --git a/PhpExecutableFinder.php b/PhpExecutableFinder.php
@@ -54,7 +54,7 @@ public function find(bool $includeArgs = true): string|false
         $args = $includeArgs && $args ? ' '.implode(' ', $args) : '';
 
         // PHP_BINARY return the current sapi executable
-        if (\PHP_BINARY && \in_array(\PHP_SAPI, ['cgi-fcgi', 'cli', 'cli-server', 'phpdbg'], true)) {
+        if (\PHP_BINARY && \in_array(\PHP_SAPI, ['cli', 'cli-server', 'phpdbg'], true)) {
             return \PHP_BINARY.$args;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function find(bool $includeArgs = true): string\|false`
`54`	`54`	`$args = $includeArgs && $args ? ' '.implode(' ', $args) : '';`
`55`	`55`
`56`	`56`	`// PHP_BINARY return the current sapi executable`
`57`		`- if (\PHP_BINARY && \in_array(\PHP_SAPI, ['cgi-fcgi', 'cli', 'cli-server', 'phpdbg'], true)) {`
	`57`	`+ if (\PHP_BINARY && \in_array(\PHP_SAPI, ['cli', 'cli-server', 'phpdbg'], true)) {`
`58`	`58`	`return \PHP_BINARY.$args;`
`59`	`59`	`}`
`60`	`60`