Merge branch '5.4' into 6.0

* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface

Author: nicolas-grekas

ExecutableFinder.php

@@ -43,8 +43,6 @@ public function addSuffix(string $suffix)
      * @param string      $name      The executable name (without the extension)
      * @param string|null $default   The default to return if no executable is found
      * @param array       $extraDirs Additional dirs to check into
-     *
-     * @return string|null The executable path or default value
      */
     public function find(string $name, string $default = null, array $extraDirs = []): ?string
     {

PhpExecutableFinder.php

@@ -28,8 +28,6 @@ public function __construct()
 
     /**
      * Finds The PHP executable.
-     *
-     * @return string|false The PHP executable path or false if it cannot be found
      */
     public function find(bool $includeArgs = true): string|false
     {
@@ -84,8 +82,6 @@ public function find(bool $includeArgs = true): string|false
 
     /**
      * Finds the PHP executable arguments.
-     *
-     * @return array The PHP executable arguments
      */
     public function findArguments(): array
     {

Process.php

@@ -558,8 +558,6 @@ public function isOutputDisabled(): bool
     /**
      * Returns the current output of the process (STDOUT).
      *
-     * @return string The process output
-     *
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
      */
@@ -580,8 +578,6 @@ public function getOutput(): string
      * In comparison with the getOutput method which always return the whole
      * output, this one returns the new output since the last call.
      *
-     * @return string The process output since the last call
-     *
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
      */
@@ -671,8 +667,6 @@ public function clearOutput(): static
     /**
      * Returns the current error output of the process (STDERR).
      *
-     * @return string The process error output
-     *
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
      */
@@ -694,8 +688,6 @@ public function getErrorOutput(): string
      * whole error output, this one returns the new error output since the last
      * call.
      *
-     * @return string The process error output since the last call
-     *
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
      */
@@ -761,8 +753,6 @@ public function getExitCodeText(): ?string
 
     /**
      * Checks if the process ended successfully.
-     *
-     * @return bool true if the process ended successfully, false otherwise
      */
     public function isSuccessful(): bool
     {
@@ -832,8 +822,6 @@ public function getStopSignal(): int
 
     /**
      * Checks if the process is currently running.
-     *
-     * @return bool true if the process is currently running, false otherwise
      */
     public function isRunning(): bool
     {
@@ -848,8 +836,6 @@ public function isRunning(): bool
 
     /**
      * Checks if the process has been started with no regard to the current state.
-     *
-     * @return bool true if status is ready, false otherwise
      */
     public function isStarted(): bool
     {
@@ -858,8 +844,6 @@ public function isStarted(): bool
 
     /**
      * Checks if the process is terminated.
-     *
-     * @return bool true if process is terminated, false otherwise
      */
     public function isTerminated(): bool
     {
@@ -872,8 +856,6 @@ public function isTerminated(): bool
      * Gets the process status.
      *
      * The status is one of: ready, started, terminated.
-     *
-     * @return string The current process status
      */
     public function getStatus(): string
     {
@@ -949,8 +931,6 @@ public function addErrorOutput(string $line)
 
     /**
      * Gets the last output time in seconds.
-     *
-     * @return float|null The last output time in seconds or null if it isn't started
      */
     public function getLastOutputTime(): ?float
     {
@@ -959,28 +939,22 @@ public function getLastOutputTime(): ?float
 
     /**
      * Gets the command line to be executed.
-     *
-     * @return string The command to execute
      */
     public function getCommandLine(): string
     {
         return \is_array($this->commandline) ? implode(' ', array_map([$this, 'escapeArgument'], $this->commandline)) : $this->commandline;
     }
 
     /**
-     * Gets the process timeout (max. runtime).
-     *
-     * @return float|null The timeout in seconds or null if it's disabled
+     * Gets the process timeout in seconds (max. runtime).
      */
     public function getTimeout(): ?float
     {
         return $this->timeout;
     }
 
     /**
-     * Gets the process idle timeout (max. time since last output).
-     *
-     * @return float|null The timeout in seconds or null if it's disabled
+     * Gets the process idle timeout in seconds (max. time since last output).
      */
     public function getIdleTimeout(): ?float
     {
@@ -1048,8 +1022,6 @@ public function setTty(bool $tty): static
 
     /**
      * Checks if the TTY mode is enabled.
-     *
-     * @return bool true if the TTY mode is enabled, false otherwise
      */
     public function isTty(): bool
     {
@@ -1078,8 +1050,6 @@ public function isPty(): bool
 
     /**
      * Gets the working directory.
-     *
-     * @return string|null The current working directory or null on failure
      */
     public function getWorkingDirectory(): ?string
     {
@@ -1106,8 +1076,6 @@ public function setWorkingDirectory(string $cwd): static
 
     /**
      * Gets the environment variables.
-     *
-     * @return array The current environment variables
      */
     public function getEnv(): array
     {
@@ -1144,7 +1112,7 @@ public function setEnv(array $env): static
     /**
      * Gets the Process input.
      *
-     * @return resource|string|\Iterator|null The Process input
+     * @return resource|string|\Iterator|null
      */
     public function getInput()
     {
@@ -1294,8 +1262,6 @@ private function getDescriptors(): array
      * the user callback (if present) with the received output.
      *
      * @param callable|null $callback The user defined PHP callback
-     *
-     * @return \Closure A PHP closure
      */
     protected function buildCallback(callable $callback = null): \Closure
     {
@@ -1476,8 +1442,6 @@ private function resetProcessData()
      * @param int  $signal         A valid POSIX signal (see https://php.net/pcntl.constants)
      * @param bool $throwException Whether to throw exception in case signal failed
      *
-     * @return bool True if the signal was sent successfully, false otherwise
-     *
      * @throws LogicException   In case the process is not running
      * @throws RuntimeException In case --enable-sigchild is activated and the process can't be killed
      * @throws RuntimeException In case of failure

ProcessUtils.php

@@ -35,8 +35,6 @@ private function __construct()
      * @param string $caller The name of method call that validates the input
      * @param mixed  $input  The input to validate
      *
-     * @return mixed The validated input
-     *
      * @throws InvalidArgumentException In case the input is not valid
      */
     public static function validateInput(string $caller, mixed $input): mixed