Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 0e7727191c3b · 2024-02-22T15:27:20.000-05:00
* 6.4:
  [DependencyInjection] Fix computing error messages involving service locators
  [Serializer] Fix unknown types normalization type when know type
  [ErrorHandler] Fix parsing messages that contain anonymous classes on PHP &gt;= 8.3.3
  [AssetMapper] Fix enquoted string pattern
  [Validator] Review Romanian (ro) translations
  [Console] Fix display of Table on Windows OS
  [FrameworkBundle] Fix config builder with extensions extended in `build()`
  [Translation] Fix extracting qualified t() function calls
  Fix vertical table on windows
  Fix the `command -v` exception when the command option with a dash prefix
  [WebProfilerBundle] disable turbo in web profiler toolbar to avoid link prefetching
  explicitly cast boolean SSL stream options
  return the unchanged text if preg_replace_callback() fails
  the 'use_notify' option is on the factory, not on the postgres connection class
  review translations
diff --git a/ExecutableFinder.php b/ExecutableFinder.php
@@ -68,7 +68,7 @@ public function find(string $name, ?string $default = null, array $extraDirs = [
             }
         }
 
-        $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v';
+        $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --';
         if (\function_exists('exec') && ($executablePath = strtok(@exec($command.' '.escapeshellarg($name)), \PHP_EOL)) && @is_executable($executablePath)) {
             return $executablePath;
         }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function find(string $name, ?string $default = null, array $extraDirs = [`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v';`
	`71`	`+ $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --';`
`72`	`72`	`if (\function_exists('exec') && ($executablePath = strtok(@exec($command.' '.escapeshellarg($name)), \PHP_EOL)) && @is_executable($executablePath)) {`
`73`	`73`	`return $executablePath;`
`74`	`74`	`}`