diff --git a/Application.php b/Application.php
index 1ea644df0..087fc0736 100644
--- a/Application.php
+++ b/Application.php
@@ -65,7 +65,7 @@
  * Usage:
  *
  *     $app = new Application('myapp', '1.0 (stable)');
- *     $app->add(new SimpleCommand());
+ *     $app->addCommand(new SimpleCommand());
  *     $app->run();
  *
  * @author Fabien Potencier <fabien@symfony.com>
@@ -530,7 +530,7 @@ public function getLongVersion(): string
      */
     public function register(string $name): Command
     {
-        return $this->add(new Command($name));
+        return $this->addCommand(new Command($name));
     }
 
     /**
@@ -538,25 +538,39 @@ public function register(string $name): Command
      *
      * If a Command is not enabled it will not be added.
      *
-     * @param Command[] $commands An array of commands
+     * @param callable[]|Command[] $commands An array of commands
      */
     public function addCommands(array $commands): void
     {
         foreach ($commands as $command) {
-            $this->add($command);
+            $this->addCommand($command);
         }
     }
 
+    /**
+     * @deprecated since Symfony 7.4, use Application::addCommand() instead
+     */
+    public function add(Command $command): ?Command
+    {
+        trigger_deprecation('symfony/console', '7.4', 'The "%s()" method is deprecated and will be removed in Symfony 8.0, use "%s::addCommand()" instead.', __METHOD__, self::class);
+
+        return $this->addCommand($command);
+    }
+
     /**
      * Adds a command object.
      *
      * If a command with the same name already exists, it will be overridden.
      * If the command is not enabled it will not be added.
      */
-    public function add(Command $command): ?Command
+    public function addCommand(callable|Command $command): ?Command
     {
         $this->init();
 
+        if (!$command instanceof Command) {
+            $command = new Command(null, $command);
+        }
+
         $command->setApplication($this);
 
         if (!$command->isEnabled()) {
@@ -622,7 +636,7 @@ public function has(string $name): bool
     {
         $this->init();
 
-        return isset($this->commands[$name]) || ($this->commandLoader?->has($name) && $this->add($this->commandLoader->get($name)));
+        return isset($this->commands[$name]) || ($this->commandLoader?->has($name) && $this->addCommand($this->commandLoader->get($name)));
     }
 
     /**
@@ -1339,8 +1353,14 @@ private function init(): void
         }
         $this->initialized = true;
 
+        if ((new \ReflectionMethod($this, 'add'))->getDeclaringClass()->getName() !== (new \ReflectionMethod($this, 'addCommand'))->getDeclaringClass()->getName()) {
+            $adder = $this->add(...);
+        } else {
+            $adder = $this->addCommand(...);
+        }
+
         foreach ($this->getDefaultCommands() as $command) {
-            $this->add($command);
+            $adder($command);
         }
     }
 }
diff --git a/Attribute/Argument.php b/Attribute/Argument.php
index e6a94d2f1..b1b40bd3e 100644
--- a/Attribute/Argument.php
+++ b/Attribute/Argument.php
@@ -11,14 +11,16 @@
 
 namespace Symfony\Component\Console\Attribute;
 
+use Symfony\Component\Console\Attribute\Reflection\ReflectionMember;
 use Symfony\Component\Console\Completion\CompletionInput;
 use Symfony\Component\Console\Completion\Suggestion;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\String\UnicodeString;
 
-#[\Attribute(\Attribute::TARGET_PARAMETER)]
+#[\Attribute(\Attribute::TARGET_PARAMETER | \Attribute::TARGET_PROPERTY)]
 class Argument
 {
     private const ALLOWED_TYPES = ['string', 'bool', 'int', 'float', 'array'];
@@ -26,7 +28,10 @@ class Argument
     private string|bool|int|float|array|null $default = null;
     private array|\Closure $suggestedValues;
     private ?int $mode = null;
-    private string $function = '';
+    /**
+     * @var string|class-string<\BackedEnum>
+     */
+    private string $typeName = '';
 
     /**
      * Represents a console command <argument> definition.
@@ -46,47 +51,47 @@ public function __construct(
     /**
      * @internal
      */
-    public static function tryFrom(\ReflectionParameter $parameter): ?self
+    public static function tryFrom(\ReflectionParameter|\ReflectionProperty $member): ?self
     {
-        /** @var self $self */
-        if (null === $self = ($parameter->getAttributes(self::class, \ReflectionAttribute::IS_INSTANCEOF)[0] ?? null)?->newInstance()) {
-            return null;
-        }
+        $reflection = new ReflectionMember($member);
 
-        if (($function = $parameter->getDeclaringFunction()) instanceof \ReflectionMethod) {
-            $self->function = $function->class.'::'.$function->name;
-        } else {
-            $self->function = $function->name;
+        if (!$self = $reflection->getAttribute(self::class)) {
+            return null;
         }
 
-        $type = $parameter->getType();
-        $name = $parameter->getName();
+        $type = $reflection->getType();
+        $name = $reflection->getName();
 
         if (!$type instanceof \ReflectionNamedType) {
-            throw new LogicException(\sprintf('The parameter "$%s" of "%s()" must have a named type. Untyped, Union or Intersection types are not supported for command arguments.', $name, $self->function));
+            throw new LogicException(\sprintf('The %s "$%s" of "%s" must have a named type. Untyped, Union or Intersection types are not supported for command arguments.', $reflection->getMemberName(), $name, $reflection->getSourceName()));
         }
 
-        $parameterTypeName = $type->getName();
+        $self->typeName = $type->getName();
+        $isBackedEnum = is_subclass_of($self->typeName, \BackedEnum::class);
 
-        if (!\in_array($parameterTypeName, self::ALLOWED_TYPES, true)) {
-            throw new LogicException(\sprintf('The type "%s" on parameter "$%s" of "%s()" is not supported as a command argument. Only "%s" types are allowed.', $parameterTypeName, $name, $self->function, implode('", "', self::ALLOWED_TYPES)));
+        if (!\in_array($self->typeName, self::ALLOWED_TYPES, true) && !$isBackedEnum) {
+            throw new LogicException(\sprintf('The type "%s" on %s "$%s" of "%s" is not supported as a command argument. Only "%s" types and backed enums are allowed.', $self->typeName, $reflection->getMemberName(), $name, $reflection->getSourceName(), implode('", "', self::ALLOWED_TYPES)));
         }
 
         if (!$self->name) {
             $self->name = (new UnicodeString($name))->kebab();
         }
 
-        $self->default = $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null;
+        $self->default = $reflection->hasDefaultValue() ? $reflection->getDefaultValue() : null;
 
-        $self->mode = $parameter->isDefaultValueAvailable() || $parameter->allowsNull() ? InputArgument::OPTIONAL : InputArgument::REQUIRED;
-        if ('array' === $parameterTypeName) {
+        $self->mode = ($reflection->hasDefaultValue() || $reflection->isNullable()) ? InputArgument::OPTIONAL : InputArgument::REQUIRED;
+        if ('array' === $self->typeName) {
             $self->mode |= InputArgument::IS_ARRAY;
         }
 
-        if (\is_array($self->suggestedValues) && !\is_callable($self->suggestedValues) && 2 === \count($self->suggestedValues) && ($instance = $parameter->getDeclaringFunction()->getClosureThis()) && $instance::class === $self->suggestedValues[0] && \is_callable([$instance, $self->suggestedValues[1]])) {
+        if (\is_array($self->suggestedValues) && !\is_callable($self->suggestedValues) && 2 === \count($self->suggestedValues) && ($instance = $reflection->getSourceThis()) && $instance::class === $self->suggestedValues[0] && \is_callable([$instance, $self->suggestedValues[1]])) {
             $self->suggestedValues = [$instance, $self->suggestedValues[1]];
         }
 
+        if ($isBackedEnum && !$self->suggestedValues) {
+            $self->suggestedValues = array_column($self->typeName::cases(), 'value');
+        }
+
         return $self;
     }
 
@@ -105,6 +110,12 @@ public function toInputArgument(): InputArgument
      */
     public function resolveValue(InputInterface $input): mixed
     {
-        return $input->getArgument($this->name);
+        $value = $input->getArgument($this->name);
+
+        if (is_subclass_of($this->typeName, \BackedEnum::class) && (\is_string($value) || \is_int($value))) {
+            return $this->typeName::tryFrom($value) ?? throw InvalidArgumentException::fromEnumValue($this->name, $value, $this->suggestedValues);
+        }
+
+        return $value;
     }
 }
diff --git a/Attribute/AsCommand.php b/Attribute/AsCommand.php
index 767d46ebb..02f156201 100644
--- a/Attribute/AsCommand.php
+++ b/Attribute/AsCommand.php
@@ -25,6 +25,7 @@ class AsCommand
      * @param string[]    $aliases     The list of aliases of the command. The command will be executed when using one of them (i.e. "cache:clean")
      * @param bool        $hidden      If true, the command won't be shown when listing all the available commands, but it can still be run as any other command
      * @param string|null $help        The help content of the command, displayed with the help page
+     * @param string[]    $usages      The list of usage examples, displayed with the help page
      */
     public function __construct(
         public string $name,
@@ -32,6 +33,7 @@ public function __construct(
         array $aliases = [],
         bool $hidden = false,
         public ?string $help = null,
+        public array $usages = [],
     ) {
         if (!$hidden && !$aliases) {
             return;
diff --git a/Attribute/Input.php b/Attribute/Input.php
new file mode 100644
index 000000000..65bbf4aef
--- /dev/null
+++ b/Attribute/Input.php
@@ -0,0 +1,116 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Attribute;
+
+use Symfony\Component\Console\Attribute\Reflection\ReflectionMember;
+use Symfony\Component\Console\Exception\LogicException;
+use Symfony\Component\Console\Input\InputInterface;
+
+#[\Attribute(\Attribute::TARGET_PARAMETER | \Attribute::TARGET_PROPERTY)]
+final class Input
+{
+    /**
+     * @var array<string, Argument|Option|self>
+     */
+    private array $definition = [];
+
+    private \ReflectionClass $class;
+
+    public static function tryFrom(\ReflectionParameter|\ReflectionProperty $member): ?self
+    {
+        $reflection = new ReflectionMember($member);
+
+        if (!$self = $reflection->getAttribute(self::class)) {
+            return null;
+        }
+
+        $type = $reflection->getType();
+
+        if (!$type instanceof \ReflectionNamedType) {
+            throw new LogicException(\sprintf('The input %s "%s" must have a named type.', $reflection->getMemberName(), $member->name));
+        }
+
+        if (!class_exists($class = $type->getName())) {
+            throw new LogicException(\sprintf('The input class "%s" does not exist.', $type->getName()));
+        }
+
+        $self->class = new \ReflectionClass($class);
+
+        foreach ($self->class->getProperties() as $property) {
+            if (!$property->isPublic() || $property->isStatic()) {
+                continue;
+            }
+
+            if ($argument = Argument::tryFrom($property)) {
+                $self->definition[$property->name] = $argument;
+                continue;
+            }
+
+            if ($option = Option::tryFrom($property)) {
+                $self->definition[$property->name] = $option;
+                continue;
+            }
+
+            if ($input = self::tryFrom($property)) {
+                $self->definition[$property->name] = $input;
+            }
+        }
+
+        if (!$self->definition) {
+            throw new LogicException(\sprintf('The input class "%s" must have at least one argument or option.', $self->class->name));
+        }
+
+        return $self;
+    }
+
+    /**
+     * @internal
+     */
+    public function resolveValue(InputInterface $input): mixed
+    {
+        $instance = $this->class->newInstanceWithoutConstructor();
+
+        foreach ($this->definition as $name => $spec) {
+            $instance->$name = $spec->resolveValue($input);
+        }
+
+        return $instance;
+    }
+
+    /**
+     * @return iterable<Argument>
+     */
+    public function getArguments(): iterable
+    {
+        foreach ($this->definition as $spec) {
+            if ($spec instanceof Argument) {
+                yield $spec;
+            } elseif ($spec instanceof self) {
+                yield from $spec->getArguments();
+            }
+        }
+    }
+
+    /**
+     * @return iterable<Option>
+     */
+    public function getOptions(): iterable
+    {
+        foreach ($this->definition as $spec) {
+            if ($spec instanceof Option) {
+                yield $spec;
+            } elseif ($spec instanceof self) {
+                yield from $spec->getOptions();
+            }
+        }
+    }
+}
diff --git a/Attribute/Option.php b/Attribute/Option.php
index 788353463..5f0f47610 100644
--- a/Attribute/Option.php
+++ b/Attribute/Option.php
@@ -11,14 +11,16 @@
 
 namespace Symfony\Component\Console\Attribute;
 
+use Symfony\Component\Console\Attribute\Reflection\ReflectionMember;
 use Symfony\Component\Console\Completion\CompletionInput;
 use Symfony\Component\Console\Completion\Suggestion;
+use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\String\UnicodeString;
 
-#[\Attribute(\Attribute::TARGET_PARAMETER)]
+#[\Attribute(\Attribute::TARGET_PARAMETER | \Attribute::TARGET_PROPERTY)]
 class Option
 {
     private const ALLOWED_TYPES = ['string', 'bool', 'int', 'float', 'array'];
@@ -27,9 +29,13 @@ class Option
     private string|bool|int|float|array|null $default = null;
     private array|\Closure $suggestedValues;
     private ?int $mode = null;
+    /**
+     * @var string|class-string<\BackedEnum>
+     */
     private string $typeName = '';
     private bool $allowNull = false;
-    private string $function = '';
+    private string $memberName = '';
+    private string $sourceName = '';
 
     /**
      * Represents a console command --option definition.
@@ -51,53 +57,52 @@ public function __construct(
     /**
      * @internal
      */
-    public static function tryFrom(\ReflectionParameter $parameter): ?self
+    public static function tryFrom(\ReflectionParameter|\ReflectionProperty $member): ?self
     {
-        /** @var self $self */
-        if (null === $self = ($parameter->getAttributes(self::class, \ReflectionAttribute::IS_INSTANCEOF)[0] ?? null)?->newInstance()) {
+        $reflection = new ReflectionMember($member);
+
+        if (!$self = $reflection->getAttribute(self::class)) {
             return null;
         }
 
-        if (($function = $parameter->getDeclaringFunction()) instanceof \ReflectionMethod) {
-            $self->function = $function->class.'::'.$function->name;
-        } else {
-            $self->function = $function->name;
-        }
+        $self->memberName = $reflection->getMemberName();
+        $self->sourceName = $reflection->getSourceName();
 
-        $name = $parameter->getName();
-        $type = $parameter->getType();
+        $name = $reflection->getName();
+        $type = $reflection->getType();
 
-        if (!$parameter->isDefaultValueAvailable()) {
-            throw new LogicException(\sprintf('The option parameter "$%s" of "%s()" must declare a default value.', $name, $self->function));
+        if (!$reflection->hasDefaultValue()) {
+            throw new LogicException(\sprintf('The option %s "$%s" of "%s" must declare a default value.', $self->memberName, $name, $self->sourceName));
         }
 
         if (!$self->name) {
             $self->name = (new UnicodeString($name))->kebab();
         }
 
-        $self->default = $parameter->getDefaultValue();
-        $self->allowNull = $parameter->allowsNull();
+        $self->default = $reflection->getDefaultValue();
+        $self->allowNull = $reflection->isNullable();
 
         if ($type instanceof \ReflectionUnionType) {
             return $self->handleUnion($type);
         }
 
         if (!$type instanceof \ReflectionNamedType) {
-            throw new LogicException(\sprintf('The parameter "$%s" of "%s()" must have a named type. Untyped or Intersection types are not supported for command options.', $name, $self->function));
+            throw new LogicException(\sprintf('The %s "$%s" of "%s" must have a named type. Untyped or Intersection types are not supported for command options.', $self->memberName, $name, $self->sourceName));
         }
 
         $self->typeName = $type->getName();
+        $isBackedEnum = is_subclass_of($self->typeName, \BackedEnum::class);
 
-        if (!\in_array($self->typeName, self::ALLOWED_TYPES, true)) {
-            throw new LogicException(\sprintf('The type "%s" on parameter "$%s" of "%s()" is not supported as a command option. Only "%s" types are allowed.', $self->typeName, $name, $self->function, implode('", "', self::ALLOWED_TYPES)));
+        if (!\in_array($self->typeName, self::ALLOWED_TYPES, true) && !$isBackedEnum) {
+            throw new LogicException(\sprintf('The type "%s" on %s "$%s" of "%s" is not supported as a command option. Only "%s" types and BackedEnum are allowed.', $self->typeName, $self->memberName, $name, $self->sourceName, implode('", "', self::ALLOWED_TYPES)));
         }
 
         if ('bool' === $self->typeName && $self->allowNull && \in_array($self->default, [true, false], true)) {
-            throw new LogicException(\sprintf('The option parameter "$%s" of "%s()" must not be nullable when it has a default boolean value.', $name, $self->function));
+            throw new LogicException(\sprintf('The option %s "$%s" of "%s" must not be nullable when it has a default boolean value.', $self->memberName, $name, $self->sourceName));
         }
 
         if ($self->allowNull && null !== $self->default) {
-            throw new LogicException(\sprintf('The option parameter "$%s" of "%s()" must either be not-nullable or have a default of null.', $name, $self->function));
+            throw new LogicException(\sprintf('The option %s "$%s" of "%s" must either be not-nullable or have a default of null.', $self->memberName, $name, $self->sourceName));
         }
 
         if ('bool' === $self->typeName) {
@@ -111,10 +116,14 @@ public static function tryFrom(\ReflectionParameter $parameter): ?self
             $self->mode = InputOption::VALUE_REQUIRED;
         }
 
-        if (\is_array($self->suggestedValues) && !\is_callable($self->suggestedValues) && 2 === \count($self->suggestedValues) && ($instance = $parameter->getDeclaringFunction()->getClosureThis()) && $instance::class === $self->suggestedValues[0] && \is_callable([$instance, $self->suggestedValues[1]])) {
+        if (\is_array($self->suggestedValues) && !\is_callable($self->suggestedValues) && 2 === \count($self->suggestedValues) && ($instance = $reflection->getSourceThis()) && $instance::class === $self->suggestedValues[0] && \is_callable([$instance, $self->suggestedValues[1]])) {
             $self->suggestedValues = [$instance, $self->suggestedValues[1]];
         }
 
+        if ($isBackedEnum && !$self->suggestedValues) {
+            $self->suggestedValues = array_column($self->typeName::cases(), 'value');
+        }
+
         return $self;
     }
 
@@ -140,6 +149,10 @@ public function resolveValue(InputInterface $input): mixed
             return true;
         }
 
+        if (is_subclass_of($this->typeName, \BackedEnum::class) && (\is_string($value) || \is_int($value))) {
+            return $this->typeName::tryFrom($value) ?? throw InvalidOptionException::fromEnumValue($this->name, $value, $this->suggestedValues);
+        }
+
         if ('array' === $this->typeName && $this->allowNull && [] === $value) {
             return null;
         }
@@ -167,11 +180,11 @@ private function handleUnion(\ReflectionUnionType $type): self
         $this->typeName = implode('|', array_filter($types));
 
         if (!\in_array($this->typeName, self::ALLOWED_UNION_TYPES, true)) {
-            throw new LogicException(\sprintf('The union type for parameter "$%s" of "%s()" is not supported as a command option. Only "%s" types are allowed.', $this->name, $this->function, implode('", "', self::ALLOWED_UNION_TYPES)));
+            throw new LogicException(\sprintf('The union type for %s "$%s" of "%s" is not supported as a command option. Only "%s" types are allowed.', $this->memberName, $this->name, $this->sourceName, implode('", "', self::ALLOWED_UNION_TYPES)));
         }
 
         if (false !== $this->default) {
-            throw new LogicException(\sprintf('The option parameter "$%s" of "%s()" must have a default value of false.', $this->name, $this->function));
+            throw new LogicException(\sprintf('The option %s "$%s" of "%s" must have a default value of false.', $this->memberName, $this->name, $this->sourceName));
         }
 
         $this->mode = InputOption::VALUE_OPTIONAL;
diff --git a/Attribute/Reflection/ReflectionMember.php b/Attribute/Reflection/ReflectionMember.php
new file mode 100644
index 000000000..7fa13ab9d
--- /dev/null
+++ b/Attribute/Reflection/ReflectionMember.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Attribute\Reflection;
+
+/**
+ * @internal
+ */
+class ReflectionMember
+{
+    public function __construct(
+        private readonly \ReflectionParameter|\ReflectionProperty $member,
+    ) {
+    }
+
+    /**
+     * @template T of object
+     *
+     * @param class-string<T> $class
+     *
+     * @return T|null
+     */
+    public function getAttribute(string $class): ?object
+    {
+        return ($this->member->getAttributes($class, \ReflectionAttribute::IS_INSTANCEOF)[0] ?? null)?->newInstance();
+    }
+
+    public function getSourceName(): string
+    {
+        if ($this->member instanceof \ReflectionProperty) {
+            return $this->member->getDeclaringClass()->name;
+        }
+
+        $function = $this->member->getDeclaringFunction();
+
+        if ($function instanceof \ReflectionMethod) {
+            return $function->class.'::'.$function->name.'()';
+        }
+
+        return $function->name.'()';
+    }
+
+    public function getSourceThis(): ?object
+    {
+        if ($this->member instanceof \ReflectionParameter) {
+            return $this->member->getDeclaringFunction()->getClosureThis();
+        }
+
+        return null;
+    }
+
+    public function getType(): ?\ReflectionType
+    {
+        return $this->member->getType();
+    }
+
+    public function getName(): string
+    {
+        return $this->member->getName();
+    }
+
+    public function hasDefaultValue(): bool
+    {
+        if ($this->member instanceof \ReflectionParameter) {
+            return $this->member->isDefaultValueAvailable();
+        }
+
+        return $this->member->hasDefaultValue();
+    }
+
+    public function getDefaultValue(): mixed
+    {
+        $defaultValue = $this->member->getDefaultValue();
+
+        if ($defaultValue instanceof \BackedEnum) {
+            return $defaultValue->value;
+        }
+
+        return $defaultValue;
+    }
+
+    public function isNullable(): bool
+    {
+        return (bool) $this->member->getType()?->allowsNull();
+    }
+
+    public function getMemberName(): string
+    {
+        return $this->member instanceof \ReflectionParameter ? 'parameter' : 'property';
+    }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f3ae3d7d..51cafcd49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,19 @@
 CHANGELOG
 =========
 
+7.4
+---
+
+ * Add `Command::getCode()` to get the code set via `setCode()`
+ * Allow setting aliases and the hidden flag via the command name passed to the constructor
+ * Introduce `Symfony\Component\Console\Application::addCommand()` to simplify using invokable commands when the component is used standalone
+ * Deprecate `Symfony\Component\Console\Application::add()` in favor of `Symfony\Component\Console\Application::addCommand()`
+ * Add `BackedEnum` support with `#[Argument]` and `#[Option]` inputs in invokable commands
+ * Allow Usages to be specified via `#[AsCommand]` attribute.
+ * Allow passing invokable commands to `Symfony\Component\Console\Tester\CommandTester`
+ * Add `#[Input]` attribute to support DTOs in commands
+ * Add optional timeout for interaction in `QuestionHelper`
+
 7.3
 ---
 
diff --git a/Command/Command.php b/Command/Command.php
index 72a10cf76..bc023eaec 100644
--- a/Command/Command.php
+++ b/Command/Command.php
@@ -87,23 +87,32 @@ public static function getDefaultDescription(): ?string
      *
      * @throws LogicException When the command name is empty
      */
-    public function __construct(?string $name = null)
+    public function __construct(?string $name = null, ?callable $code = null)
     {
-        $this->definition = new InputDefinition();
-
-        $attribute = ((new \ReflectionClass(static::class))->getAttributes(AsCommand::class)[0] ?? null)?->newInstance();
+        if (null !== $code) {
+            if (!\is_object($code) || $code instanceof \Closure) {
+                throw new InvalidArgumentException(\sprintf('The command must be an instance of "%s" or an invokable object.', self::class));
+            }
+            /** @var AsCommand $attribute */
+            $attribute = ((new \ReflectionObject($code))->getAttributes(AsCommand::class)[0] ?? null)?->newInstance()
+                ?? throw new LogicException(\sprintf('The command must use the "%s" attribute.', AsCommand::class));
+            $this->setCode($code);
+        } else {
+            $attribute = ((new \ReflectionClass(static::class))->getAttributes(AsCommand::class)[0] ?? null)?->newInstance();
+        }
 
+        $this->definition = new InputDefinition();
         if (null === $name) {
             if (self::class !== (new \ReflectionMethod($this, 'getDefaultName'))->class) {
                 trigger_deprecation('symfony/console', '7.3', 'Overriding "Command::getDefaultName()" in "%s" is deprecated and will be removed in Symfony 8.0, use the #[AsCommand] attribute instead.', static::class);
 
-                $defaultName = static::getDefaultName();
+                $name = static::getDefaultName();
             } else {
-                $defaultName = $attribute?->name;
+                $name = $attribute?->name;
             }
         }
 
-        if (null === $name && null !== $name = $defaultName) {
+        if (null !== $name) {
             $aliases = explode('|', $name);
 
             if ('' === $name = array_shift($aliases)) {
@@ -134,7 +143,11 @@ public function __construct(?string $name = null)
             $this->setHelp($attribute?->help ?? '');
         }
 
-        if (\is_callable($this) && self::class === (new \ReflectionMethod($this, 'execute'))->getDeclaringClass()->name) {
+        foreach ($attribute?->usages ?? [] as $usage) {
+            $this->addUsage($usage);
+        }
+
+        if (!$code && \is_callable($this) && self::class === (new \ReflectionMethod($this, 'execute'))->getDeclaringClass()->name) {
             $this->code = new InvokableCommand($this, $this(...));
         }
 
@@ -331,6 +344,16 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
     }
 
+    /**
+     * Gets the code that is executed by the command.
+     *
+     * @return ?callable null if the code has not been set with setCode()
+     */
+    public function getCode(): ?callable
+    {
+        return $this->code?->getCode();
+    }
+
     /**
      * Sets the code to execute when running this command.
      *
diff --git a/Command/DumpCompletionCommand.php b/Command/DumpCompletionCommand.php
index 2853fc5f4..1671120a3 100644
--- a/Command/DumpCompletionCommand.php
+++ b/Command/DumpCompletionCommand.php
@@ -46,33 +46,33 @@ protected function configure(): void
 
         $this
             ->setHelp(<<<EOH
-The <info>%command.name%</> command dumps the shell completion script required
-to use shell autocompletion (currently, {$supportedShells} completion are supported).
+                The <info>%command.name%</> command dumps the shell completion script required
+                to use shell autocompletion (currently, {$supportedShells} completion are supported).
 
-<comment>Static installation
--------------------</>
+                <comment>Static installation
+                -------------------</>
 
-Dump the script to a global completion file and restart your shell:
+                Dump the script to a global completion file and restart your shell:
 
-    <info>%command.full_name% {$shell} | sudo tee {$completionFile}</>
+                    <info>%command.full_name% {$shell} | sudo tee {$completionFile}</>
 
-Or dump the script to a local file and source it:
+                Or dump the script to a local file and source it:
 
-    <info>%command.full_name% {$shell} > completion.sh</>
+                    <info>%command.full_name% {$shell} > completion.sh</>
 
-    <comment># source the file whenever you use the project</>
-    <info>source completion.sh</>
+                    <comment># source the file whenever you use the project</>
+                    <info>source completion.sh</>
 
-    <comment># or add this line at the end of your "{$rcFile}" file:</>
-    <info>source /path/to/completion.sh</>
+                    <comment># or add this line at the end of your "{$rcFile}" file:</>
+                    <info>source /path/to/completion.sh</>
 
-<comment>Dynamic installation
---------------------</>
+                <comment>Dynamic installation
+                --------------------</>
 
-Add this to the end of your shell configuration file (e.g. <info>"{$rcFile}"</>):
+                Add this to the end of your shell configuration file (e.g. <info>"{$rcFile}"</>):
 
-    <info>eval "$({$fullCommand} completion {$shell})"</>
-EOH
+                    <info>eval "$({$fullCommand} completion {$shell})"</>
+                EOH
             )
             ->addArgument('shell', InputArgument::OPTIONAL, 'The shell type (e.g. "bash"), the value of the "$SHELL" env var will be used if this is not given', null, $this->getSupportedShells(...))
             ->addOption('debug', null, InputOption::VALUE_NONE, 'Tail the completion debug log')
diff --git a/Command/HelpCommand.php b/Command/HelpCommand.php
index a2a72dab4..a5a54b4e2 100644
--- a/Command/HelpCommand.php
+++ b/Command/HelpCommand.php
@@ -40,16 +40,16 @@ protected function configure(): void
             ])
             ->setDescription('Display help for a command')
             ->setHelp(<<<'EOF'
-The <info>%command.name%</info> command displays help for a given command:
+                The <info>%command.name%</info> command displays help for a given command:
 
-  <info>%command.full_name% list</info>
+                  <info>%command.full_name% list</info>
 
-You can also output the help in other formats by using the <comment>--format</comment> option:
+                You can also output the help in other formats by using the <info>--format</info> option:
 
-  <info>%command.full_name% --format=xml list</info>
+                  <info>%command.full_name% --format=xml list</info>
 
-To display the list of available commands, please use the <info>list</info> command.
-EOF
+                To display the list of available commands, please use the <info>list</info> command.
+                EOF
             )
         ;
     }
diff --git a/Command/InvokableCommand.php b/Command/InvokableCommand.php
index 72ff407c8..997458996 100644
--- a/Command/InvokableCommand.php
+++ b/Command/InvokableCommand.php
@@ -13,9 +13,11 @@
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Attribute\Argument;
+use Symfony\Component\Console\Attribute\Input;
 use Symfony\Component\Console\Attribute\Option;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Exception\RuntimeException;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -30,18 +32,20 @@
  */
 class InvokableCommand implements SignalableCommandInterface
 {
-    private readonly \Closure $code;
+    private readonly \Closure $closure;
     private readonly ?SignalableCommandInterface $signalableCommand;
     private readonly \ReflectionFunction $reflection;
     private bool $triggerDeprecations = false;
+    private $code;
 
     public function __construct(
         private readonly Command $command,
         callable $code,
     ) {
-        $this->code = $this->getClosure($code);
+        $this->code = $code;
+        $this->closure = $this->getClosure($code);
         $this->signalableCommand = $code instanceof SignalableCommandInterface ? $code : null;
-        $this->reflection = new \ReflectionFunction($this->code);
+        $this->reflection = new \ReflectionFunction($this->closure);
     }
 
     /**
@@ -49,7 +53,7 @@ public function __construct(
      */
     public function __invoke(InputInterface $input, OutputInterface $output): int
     {
-        $statusCode = ($this->code)(...$this->getParameters($input, $output));
+        $statusCode = ($this->closure)(...$this->getParameters($input, $output));
 
         if (!\is_int($statusCode)) {
             if ($this->triggerDeprecations) {
@@ -75,12 +79,36 @@ public function configure(InputDefinition $definition): void
         foreach ($this->reflection->getParameters() as $parameter) {
             if ($argument = Argument::tryFrom($parameter)) {
                 $definition->addArgument($argument->toInputArgument());
-            } elseif ($option = Option::tryFrom($parameter)) {
+                continue;
+            }
+
+            if ($option = Option::tryFrom($parameter)) {
                 $definition->addOption($option->toInputOption());
+                continue;
+            }
+
+            if ($input = Input::tryFrom($parameter)) {
+                $inputArguments = array_map(fn (Argument $a) => $a->toInputArgument(), iterator_to_array($input->getArguments(), false));
+
+                // make sure optional arguments are defined after required ones
+                usort($inputArguments, fn (InputArgument $a, InputArgument $b) => (int) $b->isRequired() - (int) $a->isRequired());
+
+                foreach ($inputArguments as $inputArgument) {
+                    $definition->addArgument($inputArgument);
+                }
+
+                foreach ($input->getOptions() as $option) {
+                    $definition->addOption($option->toInputOption());
+                }
             }
         }
     }
 
+    public function getCode(): callable
+    {
+        return $this->code;
+    }
+
     private function getClosure(callable $code): \Closure
     {
         if (!$code instanceof \Closure) {
@@ -121,6 +149,12 @@ private function getParameters(InputInterface $input, OutputInterface $output):
                 continue;
             }
 
+            if ($in = Input::tryFrom($parameter)) {
+                $parameters[] = $in->resolveValue($input);
+
+                continue;
+            }
+
             $type = $parameter->getType();
 
             if (!$type instanceof \ReflectionNamedType) {
diff --git a/Command/ListCommand.php b/Command/ListCommand.php
index 61b4b1b3e..789a8d9ac 100644
--- a/Command/ListCommand.php
+++ b/Command/ListCommand.php
@@ -37,22 +37,22 @@ protected function configure(): void
             ])
             ->setDescription('List commands')
             ->setHelp(<<<'EOF'
-The <info>%command.name%</info> command lists all commands:
+                The <info>%command.name%</info> command lists all commands:
 
-  <info>%command.full_name%</info>
+                  <info>%command.full_name%</info>
 
-You can also display the commands for a specific namespace:
+                You can also display the commands for a specific namespace:
 
-  <info>%command.full_name% test</info>
+                  <info>%command.full_name% test</info>
 
-You can also output the information in other formats by using the <comment>--format</comment> option:
+                You can also output the information in other formats by using the <info>--format</info> option:
 
-  <info>%command.full_name% --format=xml</info>
+                  <info>%command.full_name% --format=xml</info>
 
-It's also possible to get raw list of commands (useful for embedding command runner):
+                It's also possible to get raw list of commands (useful for embedding command runner):
 
-  <info>%command.full_name% --raw</info>
-EOF
+                  <info>%command.full_name% --raw</info>
+                EOF
             )
         ;
     }
diff --git a/Command/SignalableCommandInterface.php b/Command/SignalableCommandInterface.php
index 40b301d18..1cf851d90 100644
--- a/Command/SignalableCommandInterface.php
+++ b/Command/SignalableCommandInterface.php
@@ -20,6 +20,10 @@ interface SignalableCommandInterface
 {
     /**
      * Returns the list of signals to subscribe.
+     *
+     * @return list<\SIG*>
+     *
+     * @see https://php.net/pcntl.constants for signals
      */
     public function getSubscribedSignals(): array;
 
diff --git a/Debug/CliRequest.php b/Debug/CliRequest.php
index b023db07a..6e2c1012b 100644
--- a/Debug/CliRequest.php
+++ b/Debug/CliRequest.php
@@ -24,7 +24,7 @@ public function __construct(
         public readonly TraceableCommand $command,
     ) {
         parent::__construct(
-            attributes: ['_controller' => \get_class($command->command), '_virtual_type' => 'command'],
+            attributes: ['_controller' => $command->command::class, '_virtual_type' => 'command'],
             server: $_SERVER,
         );
     }
diff --git a/DependencyInjection/AddConsoleCommandPass.php b/DependencyInjection/AddConsoleCommandPass.php
index 562627f4b..ffbb10e8c 100644
--- a/DependencyInjection/AddConsoleCommandPass.php
+++ b/DependencyInjection/AddConsoleCommandPass.php
@@ -79,7 +79,7 @@ public function process(ContainerBuilder $container): void
             }
 
             if (null === $commandName) {
-                if (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag('container.private')) {
+                if ($definition->isPrivate() || $definition->hasTag('container.private')) {
                     $commandId = 'console.command.public_alias.'.$id;
                     $container->setAlias($commandId, $id)->setPublic(true);
                     $id = $commandId;
@@ -91,6 +91,7 @@ public function process(ContainerBuilder $container): void
 
             $description = $tags[0]['description'] ?? null;
             $help = $tags[0]['help'] ?? null;
+            $usages = $tags[0]['usages'] ?? null;
 
             unset($tags[0]);
             $lazyCommandMap[$commandName] = $id;
@@ -108,6 +109,7 @@ public function process(ContainerBuilder $container): void
 
                 $description ??= $tag['description'] ?? null;
                 $help ??= $tag['help'] ?? null;
+                $usages ??= $tag['usages'] ?? null;
             }
 
             $definition->addMethodCall('setName', [$commandName]);
@@ -124,6 +126,12 @@ public function process(ContainerBuilder $container): void
                 $definition->addMethodCall('setHelp', [str_replace('%', '%%', $help)]);
             }
 
+            if ($usages) {
+                foreach ($usages as $usage) {
+                    $definition->addMethodCall('addUsage', [$usage]);
+                }
+            }
+
             if (!$description) {
                 if (Command::class !== (new \ReflectionMethod($class, 'getDefaultDescription'))->class) {
                     trigger_deprecation('symfony/console', '7.3', 'Overriding "Command::getDefaultDescription()" in "%s" is deprecated and will be removed in Symfony 8.0, use the #[AsCommand] attribute instead.', $class);
diff --git a/Descriptor/ApplicationDescription.php b/Descriptor/ApplicationDescription.php
index 802d68560..ce778c110 100644
--- a/Descriptor/ApplicationDescription.php
+++ b/Descriptor/ApplicationDescription.php
@@ -85,7 +85,6 @@ private function inspectApplication(): void
         foreach ($this->sortCommands($all) as $namespace => $commands) {
             $names = [];
 
-            /** @var Command $command */
             foreach ($commands as $name => $command) {
                 if (!$command->getName() || (!$this->showHidden && $command->isHidden())) {
                     continue;
@@ -104,6 +103,9 @@ private function inspectApplication(): void
         }
     }
 
+    /**
+     * @return array<string, array<string, Command>>
+     */
     private function sortCommands(array $commands): array
     {
         $namespacedCommands = [];
diff --git a/Exception/InvalidArgumentException.php b/Exception/InvalidArgumentException.php
index 07cc0b61d..0482244f2 100644
--- a/Exception/InvalidArgumentException.php
+++ b/Exception/InvalidArgumentException.php
@@ -16,4 +16,17 @@
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
+    /**
+     * @internal
+     */
+    public static function fromEnumValue(string $name, string $value, array|\Closure $suggestedValues): self
+    {
+        $error = \sprintf('The value "%s" is not valid for the "%s" argument.', $value, $name);
+
+        if (\is_array($suggestedValues)) {
+            $error .= \sprintf(' Supported values are "%s".', implode('", "', $suggestedValues));
+        }
+
+        return new self($error);
+    }
 }
diff --git a/Exception/InvalidOptionException.php b/Exception/InvalidOptionException.php
index 5cf62792e..e59167df1 100644
--- a/Exception/InvalidOptionException.php
+++ b/Exception/InvalidOptionException.php
@@ -18,4 +18,17 @@
  */
 class InvalidOptionException extends \InvalidArgumentException implements ExceptionInterface
 {
+    /**
+     * @internal
+     */
+    public static function fromEnumValue(string $name, string $value, array|\Closure $suggestedValues): self
+    {
+        $error = \sprintf('The value "%s" is not valid for the "%s" option.', $value, $name);
+
+        if (\is_array($suggestedValues)) {
+            $error .= \sprintf(' Supported values are "%s".', implode('", "', $suggestedValues));
+        }
+
+        return new self($error);
+    }
 }
diff --git a/Helper/QuestionHelper.php b/Helper/QuestionHelper.php
index 09b65bbf9..5be1029de 100644
--- a/Helper/QuestionHelper.php
+++ b/Helper/QuestionHelper.php
@@ -234,7 +234,8 @@ protected function writeError(OutputInterface $output, \Exception $error): void
     /**
      * Autocompletes a question.
      *
-     * @param resource $inputStream
+     * @param resource                  $inputStream
+     * @param callable(string):string[] $autocomplete
      */
     private function autocomplete(OutputInterface $output, Question $question, $inputStream, callable $autocomplete): string
     {
@@ -270,7 +271,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
             // as opposed to fgets(), fread() returns an empty string when the stream content is empty, not false.
             if (false === $c || ('' === $ret && '' === $c && null === $question->getDefault())) {
                 shell_exec('stty '.$sttyMode);
-                throw new MissingInputException('Aborted.');
+                throw new MissingInputException('Aborted while asking: '.$question->getQuestion());
             } elseif ("\177" === $c) { // Backspace Character
                 if (0 === $numMatches && 0 !== $i) {
                     --$i;
@@ -501,6 +502,18 @@ private function isInteractiveInput($inputStream): bool
      */
     private function readInput($inputStream, Question $question): string|false
     {
+        if (null !== $question->getTimeout() && $this->isInteractiveInput($inputStream)) {
+            $read = [$inputStream];
+            $write = null;
+            $except = null;
+            $timeoutSeconds = $question->getTimeout();
+            $changedStreams = stream_select($read, $write, $except, $timeoutSeconds);
+
+            if (0 === $changedStreams) {
+                throw new MissingInputException(\sprintf('Timed out after waiting for input for %d second%s.', $timeoutSeconds, 1 === $timeoutSeconds ? '' : 's'));
+            }
+        }
+
         if (!$question->isMultiline()) {
             $cp = $this->setIOCodepage();
             $ret = fgets($inputStream, 4096);
@@ -580,7 +593,7 @@ private function cloneInputStream($inputStream)
 
         // For seekable and writable streams, add all the same data to the
         // cloned stream and then seek to the same offset.
-        if (true === $seekable && !\in_array($mode, ['r', 'rb', 'rt'])) {
+        if (true === $seekable && !\in_array($mode, ['r', 'rb', 'rt'], true)) {
             $offset = ftell($inputStream);
             rewind($inputStream);
             stream_copy_to_stream($inputStream, $cloneStream);
diff --git a/Input/InputOption.php b/Input/InputOption.php
index 25fb91782..4f8e66e5c 100644
--- a/Input/InputOption.php
+++ b/Input/InputOption.php
@@ -79,7 +79,7 @@ public function __construct(
             throw new InvalidArgumentException('An option name cannot be empty.');
         }
 
-        if ('' === $shortcut || [] === $shortcut || false === $shortcut) {
+        if ('' === $shortcut || [] === $shortcut) {
             $shortcut = null;
         }
 
diff --git a/Question/Question.php b/Question/Question.php
index 46a60c798..000c89164 100644
--- a/Question/Question.php
+++ b/Question/Question.php
@@ -24,11 +24,21 @@ class Question
     private ?int $attempts = null;
     private bool $hidden = false;
     private bool $hiddenFallback = true;
+    /**
+     * @var (\Closure(string):string[])|null
+     */
     private ?\Closure $autocompleterCallback = null;
+    /**
+     * @var (\Closure(mixed):mixed)|null
+     */
     private ?\Closure $validator = null;
+    /**
+     * @var (\Closure(mixed):mixed)|null
+     */
     private ?\Closure $normalizer = null;
     private bool $trimmable = true;
     private bool $multiline = false;
+    private ?int $timeout = null;
 
     /**
      * @param string                     $question The question to ask to the user
@@ -76,6 +86,27 @@ public function setMultiline(bool $multiline): static
         return $this;
     }
 
+    /**
+     * Returns the timeout in seconds.
+     */
+    public function getTimeout(): ?int
+    {
+        return $this->timeout;
+    }
+
+    /**
+     * Sets the maximum time the user has to answer the question.
+     * If the user does not answer within this time, an exception will be thrown.
+     *
+     * @return $this
+     */
+    public function setTimeout(?int $seconds): static
+    {
+        $this->timeout = $seconds;
+
+        return $this;
+    }
+
     /**
      * Returns whether the user response must be hidden.
      */
@@ -160,6 +191,8 @@ public function setAutocompleterValues(?iterable $values): static
 
     /**
      * Gets the callback function used for the autocompleter.
+     *
+     * @return (callable(string):string[])|null
      */
     public function getAutocompleterCallback(): ?callable
     {
@@ -171,6 +204,8 @@ public function getAutocompleterCallback(): ?callable
      *
      * The callback is passed the user input as argument and should return an iterable of corresponding suggestions.
      *
+     * @param (callable(string):string[])|null $callback
+     *
      * @return $this
      */
     public function setAutocompleterCallback(?callable $callback): static
@@ -187,6 +222,8 @@ public function setAutocompleterCallback(?callable $callback): static
     /**
      * Sets a validator for the question.
      *
+     * @param (callable(mixed):mixed)|null $validator
+     *
      * @return $this
      */
     public function setValidator(?callable $validator): static
@@ -198,6 +235,8 @@ public function setValidator(?callable $validator): static
 
     /**
      * Gets the validator for the question.
+     *
+     * @return (callable(mixed):mixed)|null
      */
     public function getValidator(): ?callable
     {
@@ -237,7 +276,7 @@ public function getMaxAttempts(): ?int
     /**
      * Sets a normalizer for the response.
      *
-     * The normalizer can be a callable (a string), a closure or a class implementing __invoke.
+     * @param callable(mixed):mixed $normalizer
      *
      * @return $this
      */
@@ -251,7 +290,7 @@ public function setNormalizer(callable $normalizer): static
     /**
      * Gets the normalizer for the response.
      *
-     * The normalizer can ba a callable (a string), a closure or a class implementing __invoke.
+     * @return (callable(mixed):mixed)|null
      */
     public function getNormalizer(): ?callable
     {
diff --git a/SingleCommandApplication.php b/SingleCommandApplication.php
index 2b54fb870..837948d12 100644
--- a/SingleCommandApplication.php
+++ b/SingleCommandApplication.php
@@ -57,7 +57,7 @@ public function run(?InputInterface $input = null, ?OutputInterface $output = nu
         $application->setAutoExit($this->autoExit);
         // Fix the usage of the command displayed with "--help"
         $this->setName($_SERVER['argv'][0]);
-        $application->add($this);
+        $application->addCommand($this);
         $application->setDefaultCommand($this->getName(), true);
 
         $this->running = true;
diff --git a/Style/StyleInterface.php b/Style/StyleInterface.php
index fcc5bc775..1a2232324 100644
--- a/Style/StyleInterface.php
+++ b/Style/StyleInterface.php
@@ -70,11 +70,15 @@ public function table(array $headers, array $rows): void;
 
     /**
      * Asks a question.
+     *
+     * @param (callable(mixed):mixed)|null $validator
      */
     public function ask(string $question, ?string $default = null, ?callable $validator = null): mixed;
 
     /**
      * Asks a question with the user input hidden.
+     *
+     * @param (callable(mixed):mixed)|null $validator
      */
     public function askHidden(string $question, ?callable $validator = null): mixed;
 
diff --git a/Tester/CommandTester.php b/Tester/CommandTester.php
index d39cde7f6..714d88ad5 100644
--- a/Tester/CommandTester.php
+++ b/Tester/CommandTester.php
@@ -24,9 +24,12 @@ class CommandTester
 {
     use TesterTrait;
 
+    private Command $command;
+
     public function __construct(
-        private Command $command,
+        callable|Command $command,
     ) {
+        $this->command = $command instanceof Command ? $command : new Command(null, $command);
     }
 
     /**
diff --git a/Tester/TesterTrait.php b/Tester/TesterTrait.php
index 238c7b7eb..1f0a55521 100644
--- a/Tester/TesterTrait.php
+++ b/Tester/TesterTrait.php
@@ -24,6 +24,10 @@
 trait TesterTrait
 {
     private StreamOutput $output;
+
+    /**
+     * @var list<string>
+     */
     private array $inputs = [];
     private bool $captureStreamsIndependently = false;
     private InputInterface $input;
@@ -107,8 +111,8 @@ public function assertCommandIsSuccessful(string $message = ''): void
     /**
      * Sets the user inputs.
      *
-     * @param array $inputs An array of strings representing each input
-     *                      passed to the command input stream
+     * @param list<string> $inputs An array of strings representing each input
+     *                             passed to the command input stream
      *
      * @return $this
      */
@@ -161,6 +165,8 @@ private function initOutput(array $options): void
     }
 
     /**
+     * @param list<string> $inputs
+     *
      * @return resource
      */
     private static function createStream(array $inputs)
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
index 6390d4828..62ea7443b 100644
--- a/Tests/ApplicationTest.php
+++ b/Tests/ApplicationTest.php
@@ -11,11 +11,16 @@
 
 namespace Symfony\Component\Console\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Command\HelpCommand;
+use Symfony\Component\Console\Command\InvokableCommand;
 use Symfony\Component\Console\Command\LazyCommand;
 use Symfony\Component\Console\Command\SignalableCommandInterface;
 use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
@@ -28,6 +33,8 @@
 use Symfony\Component\Console\Event\ConsoleSignalEvent;
 use Symfony\Component\Console\Event\ConsoleTerminateEvent;
 use Symfony\Component\Console\Exception\CommandNotFoundException;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Exception\NamespaceNotFoundException;
 use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Helper\HelperSet;
@@ -46,6 +53,8 @@
 use Symfony\Component\Console\SignalRegistry\SignalRegistry;
 use Symfony\Component\Console\Terminal;
 use Symfony\Component\Console\Tester\ApplicationTester;
+use Symfony\Component\Console\Tests\Fixtures\InvokableExtendingCommandTestCommand;
+use Symfony\Component\Console\Tests\Fixtures\InvokableTestCommand;
 use Symfony\Component\Console\Tests\Fixtures\MockableAppliationWithTerminalWidth;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -164,7 +173,7 @@ public function testAll()
         $commands = $application->all();
         $this->assertInstanceOf(HelpCommand::class, $commands['help'], '->all() returns the registered commands');
 
-        $application->add(new \FooCommand());
+        $application->addCommand(new \FooCommand());
         $commands = $application->all('foo');
         $this->assertCount(1, $commands, '->all() takes a namespace as its first argument');
     }
@@ -175,7 +184,7 @@ public function testAllWithCommandLoader()
         $commands = $application->all();
         $this->assertInstanceOf(HelpCommand::class, $commands['help'], '->all() returns the registered commands');
 
-        $application->add(new \FooCommand());
+        $application->addCommand(new \FooCommand());
         $commands = $application->all('foo');
         $this->assertCount(1, $commands, '->all() takes a namespace as its first argument');
 
@@ -219,12 +228,12 @@ public function testRegisterAmbiguous()
         $this->assertStringContainsString('It works!', $tester->getDisplay(true));
     }
 
-    public function testAdd()
+    public function testAddCommand()
     {
         $application = new Application();
-        $application->add($foo = new \FooCommand());
+        $application->addCommand($foo = new \FooCommand());
         $commands = $application->all();
-        $this->assertEquals($foo, $commands['foo:bar'], '->add() registers a command');
+        $this->assertEquals($foo, $commands['foo:bar'], '->addCommand() registers a command');
 
         $application = new Application();
         $application->addCommands([$foo = new \FooCommand(), $foo1 = new \Foo1Command()]);
@@ -237,7 +246,58 @@ public function testAddCommandWithEmptyConstructor()
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Command class "Foo5Command" is not correctly initialized. You probably forgot to call the parent constructor.');
 
-        (new Application())->add(new \Foo5Command());
+        (new Application())->addCommand(new \Foo5Command());
+    }
+
+    public function testAddCommandWithExtendedCommand()
+    {
+        $application = new Application();
+        $application->addCommand($foo = new \FooCommand());
+        $commands = $application->all();
+
+        $this->assertEquals($foo, $commands['foo:bar']);
+    }
+
+    public function testAddCommandWithInvokableCommand()
+    {
+        $application = new Application();
+        $application->addCommand($foo = new InvokableTestCommand());
+        $commands = $application->all();
+
+        $this->assertInstanceOf(Command::class, $command = $commands['invokable:test']);
+        $this->assertEquals(new InvokableCommand($command, $foo), (new \ReflectionObject($command))->getProperty('code')->getValue($command));
+    }
+
+    public function testAddCommandWithInvokableExtendedCommand()
+    {
+        $application = new Application();
+        $application->addCommand($foo = new InvokableExtendingCommandTestCommand());
+        $commands = $application->all();
+
+        $this->assertEquals($foo, $commands['invokable:test']);
+    }
+
+    #[DataProvider('provideInvalidInvokableCommands')]
+    public function testAddCommandThrowsExceptionOnInvalidCommand(callable $command, string $expectedException, string $expectedExceptionMessage)
+    {
+        $application = new Application();
+
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        $application->addCommand($command);
+    }
+
+    public static function provideInvalidInvokableCommands(): iterable
+    {
+        yield 'a function' => ['strlen', InvalidArgumentException::class, \sprintf('The command must be an instance of "%s" or an invokable object.', Command::class)];
+        yield 'a closure' => [function () {
+        }, InvalidArgumentException::class, \sprintf('The command must be an instance of "%s" or an invokable object.', Command::class)];
+        yield 'without the #[AsCommand] attribute' => [new class {
+            public function __invoke()
+            {
+            }
+        }, LogicException::class, \sprintf('The command must use the "%s" attribute.', AsCommand::class)];
     }
 
     public function testHasGet()
@@ -246,13 +306,13 @@ public function testHasGet()
         $this->assertTrue($application->has('list'), '->has() returns true if a named command is registered');
         $this->assertFalse($application->has('afoobar'), '->has() returns false if a named command is not registered');
 
-        $application->add($foo = new \FooCommand());
+        $application->addCommand($foo = new \FooCommand());
         $this->assertTrue($application->has('afoobar'), '->has() returns true if an alias is registered');
         $this->assertEquals($foo, $application->get('foo:bar'), '->get() returns a command by name');
         $this->assertEquals($foo, $application->get('afoobar'), '->get() returns a command by alias');
 
         $application = new Application();
-        $application->add($foo = new \FooCommand());
+        $application->addCommand($foo = new \FooCommand());
         // simulate --help
         $r = new \ReflectionObject($application);
         $p = $r->getProperty('wantHelps');
@@ -267,7 +327,7 @@ public function testHasGetWithCommandLoader()
         $this->assertTrue($application->has('list'), '->has() returns true if a named command is registered');
         $this->assertFalse($application->has('afoobar'), '->has() returns false if a named command is not registered');
 
-        $application->add($foo = new \FooCommand());
+        $application->addCommand($foo = new \FooCommand());
         $this->assertTrue($application->has('afoobar'), '->has() returns true if an alias is registered');
         $this->assertEquals($foo, $application->get('foo:bar'), '->get() returns a command by name');
         $this->assertEquals($foo, $application->get('afoobar'), '->get() returns a command by alias');
@@ -308,35 +368,35 @@ public function testGetInvalidCommand()
     public function testGetNamespaces()
     {
         $application = new Application();
-        $application->add(new \FooCommand());
-        $application->add(new \Foo1Command());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \Foo1Command());
         $this->assertEquals(['foo'], $application->getNamespaces(), '->getNamespaces() returns an array of unique used namespaces');
     }
 
     public function testFindNamespace()
     {
         $application = new Application();
-        $application->add(new \FooCommand());
+        $application->addCommand(new \FooCommand());
         $this->assertEquals('foo', $application->findNamespace('foo'), '->findNamespace() returns the given namespace if it exists');
         $this->assertEquals('foo', $application->findNamespace('f'), '->findNamespace() finds a namespace given an abbreviation');
-        $application->add(new \Foo2Command());
+        $application->addCommand(new \Foo2Command());
         $this->assertEquals('foo', $application->findNamespace('foo'), '->findNamespace() returns the given namespace if it exists');
     }
 
     public function testFindNamespaceWithSubnamespaces()
     {
         $application = new Application();
-        $application->add(new \FooSubnamespaced1Command());
-        $application->add(new \FooSubnamespaced2Command());
+        $application->addCommand(new \FooSubnamespaced1Command());
+        $application->addCommand(new \FooSubnamespaced2Command());
         $this->assertEquals('foo', $application->findNamespace('foo'), '->findNamespace() returns commands even if the commands are only contained in subnamespaces');
     }
 
     public function testFindAmbiguousNamespace()
     {
         $application = new Application();
-        $application->add(new \BarBucCommand());
-        $application->add(new \FooCommand());
-        $application->add(new \Foo2Command());
+        $application->addCommand(new \BarBucCommand());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \Foo2Command());
 
         $expectedMsg = "The namespace \"f\" is ambiguous.\nDid you mean one of these?\n    foo\n    foo1";
 
@@ -349,8 +409,8 @@ public function testFindAmbiguousNamespace()
     public function testFindNonAmbiguous()
     {
         $application = new Application();
-        $application->add(new \TestAmbiguousCommandRegistering());
-        $application->add(new \TestAmbiguousCommandRegistering2());
+        $application->addCommand(new \TestAmbiguousCommandRegistering());
+        $application->addCommand(new \TestAmbiguousCommandRegistering2());
         $this->assertEquals('test-ambiguous', $application->find('test')->getName());
     }
 
@@ -365,9 +425,9 @@ public function testFindInvalidNamespace()
     public function testFindUniqueNameButNamespaceName()
     {
         $application = new Application();
-        $application->add(new \FooCommand());
-        $application->add(new \Foo1Command());
-        $application->add(new \Foo2Command());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \Foo1Command());
+        $application->addCommand(new \Foo2Command());
 
         $this->expectException(CommandNotFoundException::class);
         $this->expectExceptionMessage('Command "foo1" is not defined');
@@ -378,7 +438,7 @@ public function testFindUniqueNameButNamespaceName()
     public function testFind()
     {
         $application = new Application();
-        $application->add(new \FooCommand());
+        $application->addCommand(new \FooCommand());
 
         $this->assertInstanceOf(\FooCommand::class, $application->find('foo:bar'), '->find() returns a command if its name exists');
         $this->assertInstanceOf(HelpCommand::class, $application->find('h'), '->find() returns a command if its name exists');
@@ -390,8 +450,8 @@ public function testFind()
     public function testFindCaseSensitiveFirst()
     {
         $application = new Application();
-        $application->add(new \FooSameCaseUppercaseCommand());
-        $application->add(new \FooSameCaseLowercaseCommand());
+        $application->addCommand(new \FooSameCaseUppercaseCommand());
+        $application->addCommand(new \FooSameCaseLowercaseCommand());
 
         $this->assertInstanceOf(\FooSameCaseUppercaseCommand::class, $application->find('f:B'), '->find() returns a command if the abbreviation is the correct case');
         $this->assertInstanceOf(\FooSameCaseUppercaseCommand::class, $application->find('f:BAR'), '->find() returns a command if the abbreviation is the correct case');
@@ -402,7 +462,7 @@ public function testFindCaseSensitiveFirst()
     public function testFindCaseInsensitiveAsFallback()
     {
         $application = new Application();
-        $application->add(new \FooSameCaseLowercaseCommand());
+        $application->addCommand(new \FooSameCaseLowercaseCommand());
 
         $this->assertInstanceOf(\FooSameCaseLowercaseCommand::class, $application->find('f:b'), '->find() returns a command if the abbreviation is the correct case');
         $this->assertInstanceOf(\FooSameCaseLowercaseCommand::class, $application->find('f:B'), '->find() will fallback to case insensitivity');
@@ -412,8 +472,8 @@ public function testFindCaseInsensitiveAsFallback()
     public function testFindCaseInsensitiveSuggestions()
     {
         $application = new Application();
-        $application->add(new \FooSameCaseLowercaseCommand());
-        $application->add(new \FooSameCaseUppercaseCommand());
+        $application->addCommand(new \FooSameCaseLowercaseCommand());
+        $application->addCommand(new \FooSameCaseUppercaseCommand());
 
         $this->expectException(CommandNotFoundException::class);
         $this->expectExceptionMessage('Command "FoO:BaR" is ambiguous');
@@ -435,9 +495,7 @@ public function testFindWithCommandLoader()
         $this->assertInstanceOf(\FooCommand::class, $application->find('a'), '->find() returns a command if the abbreviation exists for an alias');
     }
 
-    /**
-     * @dataProvider provideAmbiguousAbbreviations
-     */
+    #[DataProvider('provideAmbiguousAbbreviations')]
     public function testFindWithAmbiguousAbbreviations($abbreviation, $expectedExceptionMessage)
     {
         putenv('COLUMNS=120');
@@ -445,9 +503,9 @@ public function testFindWithAmbiguousAbbreviations($abbreviation, $expectedExcep
         $this->expectExceptionMessage($expectedExceptionMessage);
 
         $application = new Application();
-        $application->add(new \FooCommand());
-        $application->add(new \Foo1Command());
-        $application->add(new \Foo2Command());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \Foo1Command());
+        $application->addCommand(new \Foo2Command());
 
         $application->find($abbreviation);
     }
@@ -477,8 +535,8 @@ public function testFindWithAmbiguousAbbreviationsFindsCommandIfAlternativesAreH
     {
         $application = new Application();
 
-        $application->add(new \FooCommand());
-        $application->add(new \FooHiddenCommand());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \FooHiddenCommand());
 
         $this->assertInstanceOf(\FooCommand::class, $application->find('foo:'));
     }
@@ -486,8 +544,8 @@ public function testFindWithAmbiguousAbbreviationsFindsCommandIfAlternativesAreH
     public function testFindCommandEqualNamespace()
     {
         $application = new Application();
-        $application->add(new \Foo3Command());
-        $application->add(new \Foo4Command());
+        $application->addCommand(new \Foo3Command());
+        $application->addCommand(new \Foo4Command());
 
         $this->assertInstanceOf(\Foo3Command::class, $application->find('foo3:bar'), '->find() returns the good command even if a namespace has same name');
         $this->assertInstanceOf(\Foo4Command::class, $application->find('foo3:bar:toh'), '->find() returns a command even if its namespace equals another command name');
@@ -496,8 +554,8 @@ public function testFindCommandEqualNamespace()
     public function testFindCommandWithAmbiguousNamespacesButUniqueName()
     {
         $application = new Application();
-        $application->add(new \FooCommand());
-        $application->add(new \FoobarCommand());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \FoobarCommand());
 
         $this->assertInstanceOf(\FoobarCommand::class, $application->find('f:f'));
     }
@@ -505,18 +563,16 @@ public function testFindCommandWithAmbiguousNamespacesButUniqueName()
     public function testFindCommandWithMissingNamespace()
     {
         $application = new Application();
-        $application->add(new \Foo4Command());
+        $application->addCommand(new \Foo4Command());
 
         $this->assertInstanceOf(\Foo4Command::class, $application->find('f::t'));
     }
 
-    /**
-     * @dataProvider provideInvalidCommandNamesSingle
-     */
+    #[DataProvider('provideInvalidCommandNamesSingle')]
     public function testFindAlternativeExceptionMessageSingle($name)
     {
         $application = new Application();
-        $application->add(new \Foo3Command());
+        $application->addCommand(new \Foo3Command());
 
         $this->expectException(CommandNotFoundException::class);
         $this->expectExceptionMessage('Did you mean this');
@@ -527,7 +583,7 @@ public function testFindAlternativeExceptionMessageSingle($name)
     public function testDontRunAlternativeNamespaceName()
     {
         $application = new Application();
-        $application->add(new \Foo1Command());
+        $application->addCommand(new \Foo1Command());
         $application->setAutoExit(false);
         $tester = new ApplicationTester($application);
         $tester->run(['command' => 'foos:bar1'], ['decorated' => false]);
@@ -537,7 +593,7 @@ public function testDontRunAlternativeNamespaceName()
     public function testCanRunAlternativeCommandName()
     {
         $application = new Application();
-        $application->add(new \FooWithoutAliasCommand());
+        $application->addCommand(new \FooWithoutAliasCommand());
         $application->setAutoExit(false);
         $tester = new ApplicationTester($application);
         $tester->setInputs(['y']);
@@ -551,7 +607,7 @@ public function testCanRunAlternativeCommandName()
     public function testDontRunAlternativeCommandName()
     {
         $application = new Application();
-        $application->add(new \FooWithoutAliasCommand());
+        $application->addCommand(new \FooWithoutAliasCommand());
         $application->setAutoExit(false);
         $tester = new ApplicationTester($application);
         $tester->setInputs(['n']);
@@ -575,9 +631,9 @@ public function testRunNamespace()
         putenv('COLUMNS=120');
         $application = new Application();
         $application->setAutoExit(false);
-        $application->add(new \FooCommand());
-        $application->add(new \Foo1Command());
-        $application->add(new \Foo2Command());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \Foo1Command());
+        $application->addCommand(new \Foo2Command());
         $tester = new ApplicationTester($application);
         $tester->run(['command' => 'foo'], ['decorated' => false]);
         $display = trim($tester->getDisplay(true));
@@ -590,9 +646,9 @@ public function testFindAlternativeExceptionMessageMultiple()
     {
         putenv('COLUMNS=120');
         $application = new Application();
-        $application->add(new \FooCommand());
-        $application->add(new \Foo1Command());
-        $application->add(new \Foo2Command());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \Foo1Command());
+        $application->addCommand(new \Foo2Command());
 
         // Command + plural
         try {
@@ -615,8 +671,8 @@ public function testFindAlternativeExceptionMessageMultiple()
             $this->assertMatchesRegularExpression('/foo1/', $e->getMessage());
         }
 
-        $application->add(new \Foo3Command());
-        $application->add(new \Foo4Command());
+        $application->addCommand(new \Foo3Command());
+        $application->addCommand(new \Foo4Command());
 
         // Subnamespace + plural
         try {
@@ -633,9 +689,9 @@ public function testFindAlternativeCommands()
     {
         $application = new Application();
 
-        $application->add(new \FooCommand());
-        $application->add(new \Foo1Command());
-        $application->add(new \Foo2Command());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \Foo1Command());
+        $application->addCommand(new \Foo2Command());
 
         try {
             $application->find($commandName = 'Unknown command');
@@ -670,7 +726,7 @@ public function testFindAlternativeCommandsWithAnAlias()
         $application->setCommandLoader(new FactoryCommandLoader([
             'foo3' => static fn () => $fooCommand,
         ]));
-        $application->add($fooCommand);
+        $application->addCommand($fooCommand);
 
         $result = $application->find('foo');
 
@@ -681,10 +737,10 @@ public function testFindAlternativeNamespace()
     {
         $application = new Application();
 
-        $application->add(new \FooCommand());
-        $application->add(new \Foo1Command());
-        $application->add(new \Foo2Command());
-        $application->add(new \Foo3Command());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \Foo1Command());
+        $application->addCommand(new \Foo2Command());
+        $application->addCommand(new \Foo3Command());
 
         try {
             $application->find('Unknown-namespace:Unknown-command');
@@ -716,11 +772,11 @@ public function testFindAlternativesOutput()
     {
         $application = new Application();
 
-        $application->add(new \FooCommand());
-        $application->add(new \Foo1Command());
-        $application->add(new \Foo2Command());
-        $application->add(new \Foo3Command());
-        $application->add(new \FooHiddenCommand());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \Foo1Command());
+        $application->addCommand(new \Foo2Command());
+        $application->addCommand(new \Foo3Command());
+        $application->addCommand(new \FooHiddenCommand());
 
         $expectedAlternatives = [
             'afoobar',
@@ -756,8 +812,8 @@ public function testFindNamespaceDoesNotFailOnDeepSimilarNamespaces()
     public function testFindWithDoubleColonInNameThrowsException()
     {
         $application = new Application();
-        $application->add(new \FooCommand());
-        $application->add(new \Foo4Command());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \Foo4Command());
 
         $this->expectException(CommandNotFoundException::class);
         $this->expectExceptionMessage('Command "foo::bar" is not defined.');
@@ -768,7 +824,7 @@ public function testFindWithDoubleColonInNameThrowsException()
     public function testFindHiddenWithExactName()
     {
         $application = new Application();
-        $application->add(new \FooHiddenCommand());
+        $application->addCommand(new \FooHiddenCommand());
 
         $this->assertInstanceOf(\FooHiddenCommand::class, $application->find('foo:hidden'));
         $this->assertInstanceOf(\FooHiddenCommand::class, $application->find('afoohidden'));
@@ -778,16 +834,14 @@ public function testFindAmbiguousCommandsIfAllAlternativesAreHidden()
     {
         $application = new Application();
 
-        $application->add(new \FooCommand());
-        $application->add(new \FooHiddenCommand());
+        $application->addCommand(new \FooCommand());
+        $application->addCommand(new \FooHiddenCommand());
 
         $this->assertInstanceOf(\FooCommand::class, $application->find('foo:'));
     }
 
-    /**
-     * @testWith [true]
-     *           [false]
-     */
+    #[TestWith([true])]
+    #[TestWith([false])]
     public function testSetCatchExceptions(bool $catchErrors)
     {
         $application = new Application();
@@ -816,16 +870,14 @@ public function testSetCatchExceptions(bool $catchErrors)
         }
     }
 
-    /**
-     * @testWith [true]
-     *           [false]
-     */
+    #[TestWith([true])]
+    #[TestWith([false])]
     public function testSetCatchErrors(bool $catchExceptions)
     {
         $application = new Application();
         $application->setAutoExit(false);
         $application->setCatchExceptions($catchExceptions);
-        $application->add((new Command('boom'))->setCode(fn () => throw new \Error('This is an error.')));
+        $application->addCommand((new Command('boom'))->setCode(fn () => throw new \Error('This is an error.')));
 
         putenv('COLUMNS=120');
         $tester = new ApplicationTester($application);
@@ -871,7 +923,7 @@ public function testRenderException()
         $tester->run(['command' => 'list', '--foo' => true], ['decorated' => false, 'capture_stderr_separately' => true]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception2.txt', $tester->getErrorOutput(true), '->renderException() renders the command synopsis when an exception occurs in the context of a command');
 
-        $application->add(new \Foo3Command());
+        $application->addCommand(new \Foo3Command());
         $tester = new ApplicationTester($application);
         $tester->run(['command' => 'foo3:bar'], ['decorated' => false, 'capture_stderr_separately' => true]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
@@ -958,9 +1010,7 @@ public function testRenderExceptionLineBreaks()
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_linebreaks.txt', $tester->getDisplay(true), '->renderException() keep multiple line breaks');
     }
 
-    /**
-     * @group transient-on-windows
-     */
+    #[Group('transient-on-windows')]
     public function testRenderAnonymousException()
     {
         $application = new Application();
@@ -984,9 +1034,7 @@ public function testRenderAnonymousException()
         $this->assertStringContainsString('Dummy type "class@anonymous" is invalid.', $tester->getDisplay(true));
     }
 
-    /**
-     * @group transient-on-windows
-     */
+    #[Group('transient-on-windows')]
     public function testRenderExceptionStackTraceContainsRootException()
     {
         $application = new Application();
@@ -1032,7 +1080,7 @@ public function testRun()
         $application = new Application();
         $application->setAutoExit(false);
         $application->setCatchExceptions(false);
-        $application->add($command = new \Foo1Command());
+        $application->addCommand($command = new \Foo1Command());
         $_SERVER['argv'] = ['cli.php', 'foo:bar1'];
 
         ob_start();
@@ -1117,7 +1165,7 @@ public function testRun()
         $application = new Application();
         $application->setAutoExit(false);
         $application->setCatchExceptions(false);
-        $application->add(new \FooCommand());
+        $application->addCommand(new \FooCommand());
         $tester = new ApplicationTester($application);
 
         $tester->run(['command' => 'foo:bar', '--no-interaction' => true], ['decorated' => false]);
@@ -1152,7 +1200,7 @@ public function testVerboseValueNotBreakArguments()
         $application = new Application();
         $application->setAutoExit(false);
         $application->setCatchExceptions(false);
-        $application->add(new \FooCommand());
+        $application->addCommand(new \FooCommand());
 
         $output = new StreamOutput(fopen('php://memory', 'w', false));
 
@@ -1245,10 +1293,8 @@ public function testRunDispatchesExitCodeOneForExceptionCodeZero()
         $this->assertTrue($passedRightValue, '-> exit code 1 was passed in the console.terminate event');
     }
 
-    /**
-     * @testWith [-1]
-     *           [-32000]
-     */
+    #[TestWith([-1])]
+    #[TestWith([-32000])]
     public function testRunReturnsExitCodeOneForNegativeExceptionCode($exceptionCode)
     {
         $exception = new \Exception('', $exceptionCode);
@@ -1292,9 +1338,7 @@ public function testAddingOptionWithDuplicateShortcut()
         $application->run($input, $output);
     }
 
-    /**
-     * @dataProvider getAddingAlreadySetDefinitionElementData
-     */
+    #[DataProvider('getAddingAlreadySetDefinitionElementData')]
     public function testAddingAlreadySetDefinitionElementData($def)
     {
         $application = new Application();
@@ -1763,7 +1807,7 @@ public function testSetRunCustomDefaultCommand()
 
         $application = new Application();
         $application->setAutoExit(false);
-        $application->add($command);
+        $application->addCommand($command);
         $application->setDefaultCommand($command->getName());
 
         $tester = new ApplicationTester($application);
@@ -1785,7 +1829,7 @@ public function testSetRunCustomDefaultCommandWithOption()
 
         $application = new Application();
         $application->setAutoExit(false);
-        $application->add($command);
+        $application->addCommand($command);
         $application->setDefaultCommand($command->getName());
 
         $tester = new ApplicationTester($application);
@@ -1800,7 +1844,7 @@ public function testSetRunCustomSingleCommand()
 
         $application = new Application();
         $application->setAutoExit(false);
-        $application->add($command);
+        $application->addCommand($command);
         $application->setDefaultCommand($command->getName(), true);
 
         $tester = new ApplicationTester($application);
@@ -1982,9 +2026,7 @@ public function testCommandNameMismatchWithCommandLoaderKeyThrows()
         $app->get('test');
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testSignalListenerNotCalledByDefault()
     {
         $command = new SignableCommand(false);
@@ -2002,9 +2044,7 @@ public function testSignalListenerNotCalledByDefault()
         $this->assertFalse($dispatcherCalled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testSignalListener()
     {
         $command = new SignableCommand();
@@ -2023,9 +2063,7 @@ public function testSignalListener()
         $this->assertTrue($command->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testSignalSubscriberNotCalledByDefault()
     {
         $command = new BaseSignableCommand(false);
@@ -2040,9 +2078,7 @@ public function testSignalSubscriberNotCalledByDefault()
         $this->assertFalse($subscriber->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testSignalSubscriber()
     {
         $command = new BaseSignableCommand();
@@ -2061,9 +2097,7 @@ public function testSignalSubscriber()
         $this->assertTrue($subscriber2->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testSignalDispatchWithoutEventToDispatch()
     {
         $command = new SignableCommand();
@@ -2075,9 +2109,7 @@ public function testSignalDispatchWithoutEventToDispatch()
         $this->assertTrue($command->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testSignalDispatchWithoutEventDispatcher()
     {
         $command = new SignableCommand();
@@ -2089,9 +2121,7 @@ public function testSignalDispatchWithoutEventDispatcher()
         $this->assertTrue($command->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testSetSignalsToDispatchEvent()
     {
         if (!\defined('SIGUSR1')) {
@@ -2151,7 +2181,7 @@ public function testSignalableCommandInterfaceWithoutSignals()
         $application = new Application();
         $application->setAutoExit(false);
         $application->setDispatcher($dispatcher);
-        $application->add($command);
+        $application->addCommand($command);
         $this->assertSame(0, $application->run(new ArrayInput(['signal'])));
     }
 
@@ -2187,7 +2217,7 @@ public function testSignalableCommandDoesNotInterruptedOnTermSignals()
         $application = new Application();
         $application->setAutoExit(false);
         $application->setDispatcher($dispatcher);
-        $application->add($command);
+        $application->addCommand($command);
 
         $this->assertSame(129, $application->run(new ArrayInput(['signal'])));
     }
@@ -2209,7 +2239,7 @@ public function testSignalableWithEventCommandDoesNotInterruptedOnTermSignals()
         $application = new Application();
         $application->setAutoExit(false);
         $application->setDispatcher($dispatcher);
-        $application->add($command);
+        $application->addCommand($command);
         $tester = new ApplicationTester($application);
         $this->assertSame(51, $tester->run(['signal']));
         $expected = <<<EOTXT
@@ -2223,9 +2253,7 @@ public function testSignalableWithEventCommandDoesNotInterruptedOnTermSignals()
         $this->assertTrue($terminateEventDispatched);
     }
 
-    /**
-     * @group tty
-     */
+    #[Group('tty')]
     public function testSignalableRestoresStty()
     {
         if (!Terminal::hasSttyAvailable()) {
@@ -2256,9 +2284,7 @@ public function testSignalableRestoresStty()
         $this->assertSame($previousSttyMode, $sttyMode);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testSignalableInvokableCommand()
     {
         $command = new Command();
@@ -2274,9 +2300,7 @@ public function testSignalableInvokableCommand()
         $this->assertTrue($invokable->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testSignalableInvokableCommandThatExtendsBaseCommand()
     {
         $command = new class extends Command implements SignalableCommandInterface {
@@ -2291,9 +2315,7 @@ public function testSignalableInvokableCommandThatExtendsBaseCommand()
         $this->assertTrue($command->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testAlarmSubscriberNotCalledByDefault()
     {
         $command = new BaseSignableCommand(false);
@@ -2309,9 +2331,7 @@ public function testAlarmSubscriberNotCalledByDefault()
         $this->assertFalse($subscriber->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testAlarmSubscriberNotCalledForOtherSignals()
     {
         $command = new SignableCommand();
@@ -2330,9 +2350,7 @@ public function testAlarmSubscriberNotCalledForOtherSignals()
         $this->assertFalse($subscriber2->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testAlarmSubscriber()
     {
         $command = new BaseSignableCommand(signal: \SIGALRM);
@@ -2351,9 +2369,7 @@ public function testAlarmSubscriber()
         $this->assertTrue($subscriber2->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testAlarmDispatchWithoutEventDispatcher()
     {
         $command = new AlarmableCommand(1);
@@ -2366,9 +2382,7 @@ public function testAlarmDispatchWithoutEventDispatcher()
         $this->assertTrue($command->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testAlarmableCommandWithoutInterval()
     {
         $command = new AlarmableCommand(0);
@@ -2379,15 +2393,13 @@ public function testAlarmableCommandWithoutInterval()
         $application = new Application();
         $application->setAutoExit(false);
         $application->setDispatcher($dispatcher);
-        $application->add($command);
+        $application->addCommand($command);
 
         $this->assertSame(0, $application->run(new ArrayInput(['alarm'])));
         $this->assertFalse($command->signaled);
     }
 
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testAlarmableCommandHandlerCalledAfterEventListener()
     {
         $command = new AlarmableCommand(1);
@@ -2404,12 +2416,9 @@ public function testAlarmableCommandHandlerCalledAfterEventListener()
         $this->assertSame([AlarmEventSubscriber::class, AlarmableCommand::class], $command->signalHandlers);
     }
 
-    /**
-     * @requires extension pcntl
-     *
-     * @testWith [false]
-     *           [4]
-     */
+    #[RequiresPhpExtension('pcntl')]
+    #[TestWith([false])]
+    #[TestWith([4])]
     public function testAlarmSubscriberCalledAfterSignalSubscriberAndInheritsExitCode(int|false $exitCode)
     {
         $command = new BaseSignableCommand(signal: \SIGALRM);
@@ -2460,7 +2469,7 @@ private function createSignalableApplication(Command $command, ?EventDispatcherI
         if ($dispatcher) {
             $application->setDispatcher($dispatcher);
         }
-        $application->add(new LazyCommand($command->getName(), [], '', false, fn () => $command, true));
+        $application->addCommand(new LazyCommand($command->getName(), [], '', false, fn () => $command, true));
 
         return $application;
     }
@@ -2588,7 +2597,7 @@ public function __construct()
         parent::__construct();
 
         $command = new \FooCommand();
-        $this->add($command);
+        $this->addCommand($command);
         $this->setDefaultCommand($command->getName());
     }
 }
diff --git a/Tests/CI/GithubActionReporterTest.php b/Tests/CI/GithubActionReporterTest.php
index a35927950..f4ee70eaf 100644
--- a/Tests/CI/GithubActionReporterTest.php
+++ b/Tests/CI/GithubActionReporterTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\CI;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\CI\GithubActionReporter;
 use Symfony\Component\Console\Output\BufferedOutput;
@@ -31,9 +32,7 @@ public function testIsGithubActionEnvironment()
         }
     }
 
-    /**
-     * @dataProvider annotationsFormatProvider
-     */
+    #[DataProvider('annotationsFormatProvider')]
     public function testAnnotationsFormat(string $type, string $message, ?string $file, ?int $line, ?int $col, string $expected)
     {
         $reporter = new GithubActionReporter($buffer = new BufferedOutput());
diff --git a/Tests/Command/CommandTest.php b/Tests/Command/CommandTest.php
index 0db3572fc..3a75ea7e4 100644
--- a/Tests/Command/CommandTest.php
+++ b/Tests/Command/CommandTest.php
@@ -11,8 +11,11 @@
 
 namespace Symfony\Component\Console\Tests\Command;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectUserDeprecationMessageTrait;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -27,11 +30,10 @@
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Console\Tests\Fixtures\InvokableTestCommand;
 
 class CommandTest extends TestCase
 {
-    use ExpectUserDeprecationMessageTrait;
-
     protected static string $fixturesPath;
 
     public static function setUpBeforeClass(): void
@@ -50,7 +52,7 @@ public function testCommandNameCannotBeEmpty()
     {
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('The command defined in "Symfony\Component\Console\Command\Command" cannot have an empty name.');
-        (new Application())->add(new Command());
+        (new Application())->addCommand(new Command());
     }
 
     public function testSetApplication()
@@ -137,9 +139,7 @@ public function testGetNamespaceGetNameSetName()
         $this->assertEquals('foobar:bar', $command->getName(), '->setName() sets the command name');
     }
 
-    /**
-     * @dataProvider provideInvalidCommandNames
-     */
+    #[DataProvider('provideInvalidCommandNames')]
     public function testInvalidCommandNames($name)
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -190,7 +190,7 @@ public function testGetProcessedHelp()
         $command = new \TestCommand();
         $command->setHelp('The %command.name% command does... Example: %command.full_name%.');
         $application = new Application();
-        $application->add($command);
+        $application->addCommand($command);
         $application->setDefaultCommand('namespace:name', true);
         $this->assertStringContainsString('The namespace:name command does...', $command->getProcessedHelp(), '->getProcessedHelp() replaces %command.name% correctly in single command applications');
         $this->assertStringNotContainsString('%command.full_name%', $command->getProcessedHelp(), '->getProcessedHelp() replaces %command.full_name% in single command applications');
@@ -205,6 +205,17 @@ public function testGetSetAliases()
         $this->assertEquals(['name1'], $command->getAliases(), '->setAliases() sets the aliases');
     }
 
+    #[TestWith(['name|alias1|alias2', 'name', ['alias1', 'alias2'], false])]
+    #[TestWith(['|alias1|alias2', 'alias1', ['alias2'], true])]
+    public function testSetAliasesAndHiddenViaName(string $name, string $expectedName, array $expectedAliases, bool $expectedHidden)
+    {
+        $command = new Command($name);
+
+        self::assertSame($expectedName, $command->getName());
+        self::assertSame($expectedHidden, $command->isHidden());
+        self::assertSame($expectedAliases, $command->getAliases());
+    }
+
     public function testGetSynopsis()
     {
         $command = new \TestCommand();
@@ -291,6 +302,21 @@ public function testRunInteractive()
         $this->assertEquals('interact called'.\PHP_EOL.'execute called'.\PHP_EOL, $tester->getDisplay(), '->run() calls the interact() method if the input is interactive');
     }
 
+    public function testInvokableCommand()
+    {
+        $invokable = new InvokableTestCommand();
+        $command = new Command(null, $invokable);
+        $this->assertSame('invokable:test', $command->getName());
+        $this->assertSame(['inv-test'], $command->getAliases());
+        $this->assertSame(['invokable:test usage1', 'invokable:test usage2'], $command->getUsages());
+        $this->assertSame('desc', $command->getDescription());
+        $this->assertSame('help me', $command->getHelp());
+
+        $tester = new CommandTester($invokable);
+
+        $this->assertSame(Command::SUCCESS, $tester->execute([]));
+    }
+
     public function testRunNonInteractive()
     {
         $tester = new CommandTester(new \TestCommand());
@@ -370,9 +396,7 @@ public static function getSetCodeBindToClosureTests()
         ];
     }
 
-    /**
-     * @dataProvider getSetCodeBindToClosureTests
-     */
+    #[DataProvider('getSetCodeBindToClosureTests')]
     public function testSetCodeBindToClosure($previouslyBound, $expected)
     {
         $code = createClosure();
@@ -444,13 +468,16 @@ public function testCommandAttribute()
         $this->assertSame('foo', $command->getName());
         $this->assertSame('desc', $command->getDescription());
         $this->assertSame('help', $command->getHelp());
+        $this->assertCount(2, $command->getUsages());
+        $this->assertStringContainsString('usage1', $command->getUsages()[0]);
         $this->assertTrue($command->isHidden());
         $this->assertSame(['f'], $command->getAliases());
+        // Standard commands don't have code.
+        $this->assertNull($command->getCode());
     }
 
-    /**
-     * @group legacy
-     */
+    #[IgnoreDeprecations]
+    #[Group('legacy')]
     public function testCommandAttributeWithDeprecatedMethods()
     {
         $this->expectUserDeprecationMessage('Since symfony/console 7.3: Method "Symfony\Component\Console\Command\Command::getDefaultName()" is deprecated and will be removed in Symfony 8.0, use the #[AsCommand] attribute instead.');
@@ -468,9 +495,8 @@ public function testAttributeOverridesProperty()
         $this->assertSame('This is a command I wrote all by myself', $command->getDescription());
     }
 
-    /**
-     * @group legacy
-     */
+    #[IgnoreDeprecations]
+    #[Group('legacy')]
     public function testAttributeOverridesPropertyWithDeprecatedMethods()
     {
         $this->expectUserDeprecationMessage('Since symfony/console 7.3: Method "Symfony\Component\Console\Command\Command::getDefaultName()" is deprecated and will be removed in Symfony 8.0, use the #[AsCommand] attribute instead.');
@@ -494,9 +520,8 @@ public function testDefaultCommand()
         $this->assertEquals('foo2', $property->getValue($apl));
     }
 
-    /**
-     * @group legacy
-     */
+    #[IgnoreDeprecations]
+    #[Group('legacy')]
     public function testDeprecatedMethods()
     {
         $this->expectUserDeprecationMessage('Since symfony/console 7.3: Overriding "Command::getDefaultName()" in "Symfony\Component\Console\Tests\Command\FooCommand" is deprecated and will be removed in Symfony 8.0, use the #[AsCommand] attribute instead.');
@@ -505,9 +530,8 @@ public function testDeprecatedMethods()
         new FooCommand();
     }
 
-    /**
-     * @group legacy
-     */
+    #[IgnoreDeprecations]
+    #[Group('legacy')]
     public function testDeprecatedNonIntegerReturnTypeFromClosureCode()
     {
         $this->expectUserDeprecationMessage('Since symfony/console 7.3: Returning a non-integer value from the command "foo" is deprecated and will throw an exception in Symfony 8.0.');
@@ -529,7 +553,7 @@ function createClosure()
     };
 }
 
-#[AsCommand(name: 'foo', description: 'desc', hidden: true, aliases: ['f'], help: 'help')]
+#[AsCommand(name: 'foo', description: 'desc', usages: ['usage1', 'usage2'], hidden: true, aliases: ['f'], help: 'help')]
 class Php8Command extends Command
 {
 }
diff --git a/Tests/Command/CompleteCommandTest.php b/Tests/Command/CompleteCommandTest.php
index 75519eb49..8f26b0360 100644
--- a/Tests/Command/CompleteCommandTest.php
+++ b/Tests/Command/CompleteCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Command;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
@@ -33,7 +34,7 @@ protected function setUp(): void
         $this->command = new CompleteCommand();
 
         $this->application = new Application();
-        $this->application->add(new CompleteCommandTest_HelloCommand());
+        $this->application->addCommand(new CompleteCommandTest_HelloCommand());
 
         $this->command->setApplication($this->application);
         $this->tester = new CommandTester($this->command);
@@ -65,9 +66,7 @@ public function testAdditionalShellSupport()
         $this->execute(['--shell' => 'bash', '--current' => '1', '--input' => ['bin/console']]);
     }
 
-    /**
-     * @dataProvider provideInputAndCurrentOptionValues
-     */
+    #[DataProvider('provideInputAndCurrentOptionValues')]
     public function testInputAndCurrentOptionValidation(array $input, ?string $exceptionMessage)
     {
         if ($exceptionMessage) {
@@ -91,9 +90,7 @@ public static function provideInputAndCurrentOptionValues()
         yield [['--current' => '2', '--input' => ['bin/console', 'cache:clear']], null];
     }
 
-    /**
-     * @dataProvider provideCompleteCommandNameInputs
-     */
+    #[DataProvider('provideCompleteCommandNameInputs')]
     public function testCompleteCommandName(array $input, array $suggestions)
     {
         $this->execute(['--current' => '1', '--input' => $input]);
@@ -108,9 +105,7 @@ public static function provideCompleteCommandNameInputs()
         yield 'complete-aliases' => [['bin/console', 'ah'], ['hello', 'ahoy']];
     }
 
-    /**
-     * @dataProvider provideCompleteCommandInputDefinitionInputs
-     */
+    #[DataProvider('provideCompleteCommandInputDefinitionInputs')]
     public function testCompleteCommandInputDefinition(array $input, array $suggestions)
     {
         $this->execute(['--current' => '2', '--input' => $input]);
diff --git a/Tests/Command/DumpCompletionCommandTest.php b/Tests/Command/DumpCompletionCommandTest.php
index ba23bb331..a69711e0e 100644
--- a/Tests/Command/DumpCompletionCommandTest.php
+++ b/Tests/Command/DumpCompletionCommandTest.php
@@ -11,15 +11,14 @@
 
 namespace Symfony\Component\Console\Tests\Command;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Command\DumpCompletionCommand;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
 
 class DumpCompletionCommandTest extends TestCase
 {
-    /**
-     * @dataProvider provideCompletionSuggestions
-     */
+    #[DataProvider('provideCompletionSuggestions')]
     public function testComplete(array $input, array $expectedSuggestions)
     {
         $tester = new CommandCompletionTester(new DumpCompletionCommand());
diff --git a/Tests/Command/HelpCommandTest.php b/Tests/Command/HelpCommandTest.php
index c36ab62df..160d78560 100644
--- a/Tests/Command/HelpCommandTest.php
+++ b/Tests/Command/HelpCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Command;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\HelpCommand;
@@ -70,14 +71,12 @@ public function testExecuteForApplicationCommandWithXmlOption()
         $this->assertStringContainsString('<command', $commandTester->getDisplay(), '->execute() returns an XML help text if --format=xml is passed');
     }
 
-    /**
-     * @dataProvider provideCompletionSuggestions
-     */
+    #[DataProvider('provideCompletionSuggestions')]
     public function testComplete(array $input, array $expectedSuggestions)
     {
         require_once realpath(__DIR__.'/../Fixtures/FooCommand.php');
         $application = new Application();
-        $application->add(new \FooCommand());
+        $application->addCommand(new \FooCommand());
         $tester = new CommandCompletionTester($application->get('help'));
         $suggestions = $tester->complete($input, 2);
         $this->assertSame($expectedSuggestions, $suggestions);
diff --git a/Tests/Command/InvokableCommandTest.php b/Tests/Command/InvokableCommandTest.php
index 9fc40809a..7f11e7674 100644
--- a/Tests/Command/InvokableCommandTest.php
+++ b/Tests/Command/InvokableCommandTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Console\Tests\Command;
 
+use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Attribute\Argument;
 use Symfony\Component\Console\Attribute\Option;
@@ -18,12 +20,14 @@
 use Symfony\Component\Console\Completion\CompletionInput;
 use Symfony\Component\Console\Completion\CompletionSuggestions;
 use Symfony\Component\Console\Completion\Suggestion;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tests\Fixtures\InvokableTestCommand;
 
 class InvokableCommandTest extends TestCase
 {
@@ -132,6 +136,88 @@ public function testCommandInputOptionDefinition()
         self::assertFalse($optInputOption->getDefault());
     }
 
+    public function testEnumArgument()
+    {
+        $command = new Command('foo');
+        $command->setCode(function (
+            #[Argument] StringEnum $enum,
+            #[Argument] StringEnum $enumWithDefault = StringEnum::Image,
+            #[Argument] ?StringEnum $nullableEnum = null,
+        ): int {
+            Assert::assertSame(StringEnum::Image, $enum);
+            Assert::assertSame(StringEnum::Image, $enumWithDefault);
+            Assert::assertNull($nullableEnum);
+
+            return 0;
+        });
+
+        $enumInputArgument = $command->getDefinition()->getArgument('enum');
+        self::assertTrue($enumInputArgument->isRequired());
+        self::assertNull($enumInputArgument->getDefault());
+        self::assertTrue($enumInputArgument->hasCompletion());
+
+        $enumWithDefaultInputArgument = $command->getDefinition()->getArgument('enum-with-default');
+        self::assertFalse($enumWithDefaultInputArgument->isRequired());
+        self::assertSame('image', $enumWithDefaultInputArgument->getDefault());
+        self::assertTrue($enumWithDefaultInputArgument->hasCompletion());
+
+        $nullableEnumInputArgument = $command->getDefinition()->getArgument('nullable-enum');
+        self::assertFalse($nullableEnumInputArgument->isRequired());
+        self::assertNull($nullableEnumInputArgument->getDefault());
+        self::assertTrue($nullableEnumInputArgument->hasCompletion());
+
+        $enumInputArgument->complete(CompletionInput::fromTokens([], 0), $suggestions = new CompletionSuggestions());
+        self::assertEquals([new Suggestion('image'), new Suggestion('video')], $suggestions->getValueSuggestions());
+
+        $command->run(new ArrayInput(['enum' => 'image']), new NullOutput());
+
+        self::expectException(InvalidArgumentException::class);
+        self::expectExceptionMessage('The value "incorrect" is not valid for the "enum" argument. Supported values are "image", "video".');
+
+        $command->run(new ArrayInput(['enum' => 'incorrect']), new NullOutput());
+    }
+
+    public function testEnumOption()
+    {
+        $command = new Command('foo');
+        $command->setCode(function (
+            #[Option] StringEnum $enum = StringEnum::Video,
+            #[Option] StringEnum $enumWithDefault = StringEnum::Image,
+            #[Option] ?StringEnum $nullableEnum = null,
+        ): int {
+            Assert::assertSame(StringEnum::Image, $enum);
+            Assert::assertSame(StringEnum::Image, $enumWithDefault);
+            Assert::assertNull($nullableEnum);
+
+            return 0;
+        });
+
+        $enumInputOption = $command->getDefinition()->getOption('enum');
+        self::assertTrue($enumInputOption->isValueRequired());
+        self::assertSame('video', $enumInputOption->getDefault());
+        self::assertTrue($enumInputOption->hasCompletion());
+
+        $enumWithDefaultInputOption = $command->getDefinition()->getOption('enum-with-default');
+        self::assertTrue($enumWithDefaultInputOption->isValueRequired());
+        self::assertSame('image', $enumWithDefaultInputOption->getDefault());
+        self::assertTrue($enumWithDefaultInputOption->hasCompletion());
+
+        $nullableEnumInputOption = $command->getDefinition()->getOption('nullable-enum');
+        self::assertTrue($nullableEnumInputOption->isValueRequired());
+        self::assertNull($nullableEnumInputOption->getDefault());
+        self::assertTrue($nullableEnumInputOption->hasCompletion());
+
+        $enumInputOption->complete(CompletionInput::fromTokens([], 0), $suggestions = new CompletionSuggestions());
+        self::assertEquals([new Suggestion('image'), new Suggestion('video')], $suggestions->getValueSuggestions());
+
+        $command->run(new ArrayInput(['--enum' => 'image']), new NullOutput());
+
+        self::expectException(InvalidOptionException::class);
+        self::expectExceptionMessage('The value "incorrect" is not valid for the "enum" option. Supported values are "image", "video".');
+
+        $command->run(new ArrayInput(['--enum' => 'incorrect']), new NullOutput());
+    }
+
     public function testInvalidArgumentType()
     {
         $command = new Command('foo');
@@ -208,9 +294,15 @@ public function __invoke()
         $command->run(new ArrayInput([]), new NullOutput());
     }
 
-    /**
-     * @dataProvider provideInputArguments
-     */
+    public function testGetCode()
+    {
+        $invokableTestCommand = new InvokableTestCommand();
+        $command = new Command(null, $invokableTestCommand);
+
+        $this->assertSame($invokableTestCommand, $command->getCode());
+    }
+
+    #[DataProvider('provideInputArguments')]
     public function testInputArguments(array $parameters, array $expected)
     {
         $command = new Command('foo');
@@ -238,9 +330,7 @@ public static function provideInputArguments(): \Generator
         yield 'required & without-value' => [['a' => 'x', 'b' => null, 'c' => null, 'd' => null], ['x', null, '', []]];
     }
 
-    /**
-     * @dataProvider provideBinaryInputOptions
-     */
+    #[DataProvider('provideBinaryInputOptions')]
     public function testBinaryInputOptions(array $parameters, array $expected)
     {
         $command = new Command('foo');
@@ -266,9 +356,7 @@ public static function provideBinaryInputOptions(): \Generator
         yield 'negative' => [['--no-a' => null, '--no-c' => null], [false, false, false]];
     }
 
-    /**
-     * @dataProvider provideNonBinaryInputOptions
-     */
+    #[DataProvider('provideNonBinaryInputOptions')]
     public function testNonBinaryInputOptions(array $parameters, array $expected)
     {
         $command = new Command('foo');
@@ -321,9 +409,7 @@ public static function provideNonBinaryInputOptions(): \Generator
         ];
     }
 
-    /**
-     * @dataProvider provideInvalidOptionDefinitions
-     */
+    #[DataProvider('provideInvalidOptionDefinitions')]
     public function testInvalidOptionDefinition(callable $code)
     {
         $command = new Command('foo');
@@ -381,3 +467,9 @@ public function getSuggestedRoles(CompletionInput $input): array
         return ['ROLE_ADMIN', 'ROLE_USER'];
     }
 }
+
+enum StringEnum: string
+{
+    case Image = 'image';
+    case Video = 'video';
+}
diff --git a/Tests/Command/ListCommandTest.php b/Tests/Command/ListCommandTest.php
index a6ffc8ab5..916c1dfac 100644
--- a/Tests/Command/ListCommandTest.php
+++ b/Tests/Command/ListCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Command;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
@@ -41,11 +42,11 @@ public function testExecuteListsCommandsWithRawOption()
         $commandTester = new CommandTester($command = $application->get('list'));
         $commandTester->execute(['command' => $command->getName(), '--raw' => true]);
         $output = <<<'EOF'
-completion   Dump the shell completion script
-help         Display help for a command
-list         List commands
+            completion   Dump the shell completion script
+            help         Display help for a command
+            list         List commands
 
-EOF;
+            EOF;
 
         $this->assertEquals($output, $commandTester->getDisplay(true));
     }
@@ -54,13 +55,13 @@ public function testExecuteListsCommandsWithNamespaceArgument()
     {
         require_once realpath(__DIR__.'/../Fixtures/FooCommand.php');
         $application = new Application();
-        $application->add(new \FooCommand());
+        $application->addCommand(new \FooCommand());
         $commandTester = new CommandTester($command = $application->get('list'));
         $commandTester->execute(['command' => $command->getName(), 'namespace' => 'foo', '--raw' => true]);
         $output = <<<'EOF'
-foo:bar   The foo:bar command
+            foo:bar   The foo:bar command
 
-EOF;
+            EOF;
 
         $this->assertEquals($output, $commandTester->getDisplay(true));
     }
@@ -69,31 +70,31 @@ public function testExecuteListsCommandsOrder()
     {
         require_once realpath(__DIR__.'/../Fixtures/Foo6Command.php');
         $application = new Application();
-        $application->add(new \Foo6Command());
+        $application->addCommand(new \Foo6Command());
         $commandTester = new CommandTester($command = $application->get('list'));
         $commandTester->execute(['command' => $command->getName()], ['decorated' => false]);
         $output = <<<'EOF'
-Console Tool
-
-Usage:
-  command [options] [arguments]
-
-Options:
-  -h, --help            Display help for the given command. When no command is given display help for the list command
-      --silent          Do not output any message
-  -q, --quiet           Only errors are displayed. All other output is suppressed
-  -V, --version         Display this application version
-      --ansi|--no-ansi  Force (or disable --no-ansi) ANSI output
-  -n, --no-interaction  Do not ask any interactive question
-  -v|vv|vvv, --verbose  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
-
-Available commands:
-  completion  Dump the shell completion script
-  help        Display help for a command
-  list        List commands
- 0foo
-  0foo:bar    0foo:bar command
-EOF;
+            Console Tool
+
+            Usage:
+              command [options] [arguments]
+
+            Options:
+              -h, --help            Display help for the given command. When no command is given display help for the list command
+                  --silent          Do not output any message
+              -q, --quiet           Only errors are displayed. All other output is suppressed
+              -V, --version         Display this application version
+                  --ansi|--no-ansi  Force (or disable --no-ansi) ANSI output
+              -n, --no-interaction  Do not ask any interactive question
+              -v|vv|vvv, --verbose  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+            Available commands:
+              completion  Dump the shell completion script
+              help        Display help for a command
+              list        List commands
+             0foo
+              0foo:bar    0foo:bar command
+            EOF;
 
         $this->assertEquals($output, trim($commandTester->getDisplay(true)));
     }
@@ -102,27 +103,25 @@ public function testExecuteListsCommandsOrderRaw()
     {
         require_once realpath(__DIR__.'/../Fixtures/Foo6Command.php');
         $application = new Application();
-        $application->add(new \Foo6Command());
+        $application->addCommand(new \Foo6Command());
         $commandTester = new CommandTester($command = $application->get('list'));
         $commandTester->execute(['command' => $command->getName(), '--raw' => true]);
         $output = <<<'EOF'
-completion   Dump the shell completion script
-help         Display help for a command
-list         List commands
-0foo:bar     0foo:bar command
-EOF;
+            completion   Dump the shell completion script
+            help         Display help for a command
+            list         List commands
+            0foo:bar     0foo:bar command
+            EOF;
 
         $this->assertEquals($output, trim($commandTester->getDisplay(true)));
     }
 
-    /**
-     * @dataProvider provideCompletionSuggestions
-     */
+    #[DataProvider('provideCompletionSuggestions')]
     public function testComplete(array $input, array $expectedSuggestions)
     {
         require_once realpath(__DIR__.'/../Fixtures/FooCommand.php');
         $application = new Application();
-        $application->add(new \FooCommand());
+        $application->addCommand(new \FooCommand());
         $tester = new CommandCompletionTester($application->get('list'));
         $suggestions = $tester->complete($input, 2);
         $this->assertSame($expectedSuggestions, $suggestions);
diff --git a/Tests/Command/TraceableCommandTest.php b/Tests/Command/TraceableCommandTest.php
index 1bf709f8b..eab84c549 100644
--- a/Tests/Command/TraceableCommandTest.php
+++ b/Tests/Command/TraceableCommandTest.php
@@ -25,7 +25,7 @@ class TraceableCommandTest extends TestCase
     protected function setUp(): void
     {
         $this->application = new Application();
-        $this->application->add(new LoopExampleCommand());
+        $this->application->addCommand(new LoopExampleCommand());
     }
 
     public function testRunIsOverriddenWithoutProfile()
@@ -47,7 +47,7 @@ public function testRunIsNotOverriddenWithProfile()
         $command = new LoopExampleCommand();
         $traceableCommand = new TraceableCommand($command, new Stopwatch());
 
-        $this->application->add($traceableCommand);
+        $this->application->addCommand($traceableCommand);
 
         $commandTester = new CommandTester($traceableCommand);
         $commandTester->execute([]);
diff --git a/Tests/Completion/CompletionInputTest.php b/Tests/Completion/CompletionInputTest.php
index df0d081fd..58493fdf0 100644
--- a/Tests/Completion/CompletionInputTest.php
+++ b/Tests/Completion/CompletionInputTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Completion;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Completion\CompletionInput;
 use Symfony\Component\Console\Input\InputArgument;
@@ -19,9 +20,7 @@
 
 class CompletionInputTest extends TestCase
 {
-    /**
-     * @dataProvider provideBindData
-     */
+    #[DataProvider('provideBindData')]
     public function testBind(CompletionInput $input, string $expectedType, ?string $expectedName, string $expectedValue)
     {
         $definition = new InputDefinition([
@@ -74,9 +73,7 @@ public static function provideBindData()
         yield 'end' => [CompletionInput::fromTokens(['bin/console', 'symfony', 'sensiolabs'], 3), CompletionInput::TYPE_NONE, null, ''];
     }
 
-    /**
-     * @dataProvider provideBindWithLastArrayArgumentData
-     */
+    #[DataProvider('provideBindWithLastArrayArgumentData')]
     public function testBindWithLastArrayArgument(CompletionInput $input, ?string $expectedValue)
     {
         $definition = new InputDefinition([
@@ -111,9 +108,7 @@ public function testBindArgumentWithDefault()
         $this->assertEquals('', $input->getCompletionValue(), 'Unexpected value');
     }
 
-    /**
-     * @dataProvider provideFromStringData
-     */
+    #[DataProvider('provideFromStringData')]
     public function testFromString($inputStr, array $expectedTokens)
     {
         $input = CompletionInput::fromString($inputStr, 1);
diff --git a/Tests/ConsoleEventsTest.php b/Tests/ConsoleEventsTest.php
index 408f8c0d3..3421eda80 100644
--- a/Tests/ConsoleEventsTest.php
+++ b/Tests/ConsoleEventsTest.php
@@ -58,7 +58,7 @@ public function testEventAliases()
             ->setPublic(true)
             ->addMethodCall('setAutoExit', [false])
             ->addMethodCall('setDispatcher', [new Reference('event_dispatcher')])
-            ->addMethodCall('add', [new Reference('failing_command')])
+            ->addMethodCall('addCommand', [new Reference('failing_command')])
         ;
 
         $container->compile();
diff --git a/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/Tests/DependencyInjection/AddConsoleCommandPassTest.php
index 9ac660100..953e5843c 100644
--- a/Tests/DependencyInjection/AddConsoleCommandPassTest.php
+++ b/Tests/DependencyInjection/AddConsoleCommandPassTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\DependencyInjection;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -28,9 +29,7 @@
 
 class AddConsoleCommandPassTest extends TestCase
 {
-    /**
-     * @dataProvider visibilityProvider
-     */
+    #[DataProvider('visibilityProvider')]
     public function testProcess($public)
     {
         $container = new ContainerBuilder();
@@ -315,6 +314,7 @@ public function testProcessInvokableCommand()
         $definition->addTag('console.command', [
             'command' => 'invokable',
             'description' => 'The command description',
+            'usages' => ['usage1', 'usage2'],
             'help' => 'The %command.name% command help content.',
         ]);
         $container->setDefinition('invokable_command', $definition);
@@ -325,6 +325,8 @@ public function testProcessInvokableCommand()
         self::assertTrue($container->has('invokable_command.command'));
         self::assertSame('The command description', $command->getDescription());
         self::assertSame('The %command.name% command help content.', $command->getHelp());
+        self::assertCount(2, $command->getUsages());
+        $this->assertStringContainsString('usage1', $command->getUsages()[0]);
     }
 
     public function testProcessInvokableSignalableCommand()
diff --git a/Tests/Descriptor/AbstractDescriptorTestCase.php b/Tests/Descriptor/AbstractDescriptorTestCase.php
index 93658f4be..0c4eee158 100644
--- a/Tests/Descriptor/AbstractDescriptorTestCase.php
+++ b/Tests/Descriptor/AbstractDescriptorTestCase.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Descriptor;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
@@ -21,31 +22,31 @@
 
 abstract class AbstractDescriptorTestCase extends TestCase
 {
-    /** @dataProvider getDescribeInputArgumentTestData */
+    #[DataProvider('getDescribeInputArgumentTestData')]
     public function testDescribeInputArgument(InputArgument $argument, $expectedDescription)
     {
         $this->assertDescription($expectedDescription, $argument);
     }
 
-    /** @dataProvider getDescribeInputOptionTestData */
+    #[DataProvider('getDescribeInputOptionTestData')]
     public function testDescribeInputOption(InputOption $option, $expectedDescription)
     {
         $this->assertDescription($expectedDescription, $option);
     }
 
-    /** @dataProvider getDescribeInputDefinitionTestData */
+    #[DataProvider('getDescribeInputDefinitionTestData')]
     public function testDescribeInputDefinition(InputDefinition $definition, $expectedDescription)
     {
         $this->assertDescription($expectedDescription, $definition);
     }
 
-    /** @dataProvider getDescribeCommandTestData */
+    #[DataProvider('getDescribeCommandTestData')]
     public function testDescribeCommand(Command $command, $expectedDescription)
     {
         $this->assertDescription($expectedDescription, $command);
     }
 
-    /** @dataProvider getDescribeApplicationTestData */
+    #[DataProvider('getDescribeApplicationTestData')]
     public function testDescribeApplication(Application $application, $expectedDescription)
     {
         // the "completion" command has dynamic help information depending on the shell
diff --git a/Tests/Descriptor/ApplicationDescriptionTest.php b/Tests/Descriptor/ApplicationDescriptionTest.php
index 1933c985c..a6117952a 100644
--- a/Tests/Descriptor/ApplicationDescriptionTest.php
+++ b/Tests/Descriptor/ApplicationDescriptionTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Descriptor;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
@@ -18,14 +19,12 @@
 
 final class ApplicationDescriptionTest extends TestCase
 {
-    /**
-     * @dataProvider getNamespacesProvider
-     */
+    #[DataProvider('getNamespacesProvider')]
     public function testGetNamespaces(array $expected, array $names)
     {
         $application = new TestApplication();
         foreach ($names as $name) {
-            $application->add(new Command($name));
+            $application->addCommand(new Command($name));
         }
 
         $this->assertSame($expected, array_keys((new ApplicationDescription($application))->getNamespaces()));
diff --git a/Tests/Fixtures/DescriptorApplication2.php b/Tests/Fixtures/DescriptorApplication2.php
index 7bb02fa54..c755bab38 100644
--- a/Tests/Fixtures/DescriptorApplication2.php
+++ b/Tests/Fixtures/DescriptorApplication2.php
@@ -18,9 +18,9 @@ class DescriptorApplication2 extends Application
     public function __construct()
     {
         parent::__construct('My Symfony application', 'v1.0');
-        $this->add(new DescriptorCommand1());
-        $this->add(new DescriptorCommand2());
-        $this->add(new DescriptorCommand3());
-        $this->add(new DescriptorCommand4());
+        $this->addCommand(new DescriptorCommand1());
+        $this->addCommand(new DescriptorCommand2());
+        $this->addCommand(new DescriptorCommand3());
+        $this->addCommand(new DescriptorCommand4());
     }
 }
diff --git a/Tests/Fixtures/DescriptorApplicationMbString.php b/Tests/Fixtures/DescriptorApplicationMbString.php
index bf170c449..a76e0e181 100644
--- a/Tests/Fixtures/DescriptorApplicationMbString.php
+++ b/Tests/Fixtures/DescriptorApplicationMbString.php
@@ -19,6 +19,6 @@ public function __construct()
     {
         parent::__construct('MbString åpplicätion');
 
-        $this->add(new DescriptorCommandMbString());
+        $this->addCommand(new DescriptorCommandMbString());
     }
 }
diff --git a/Tests/Fixtures/InvokableExtendingCommandTestCommand.php b/Tests/Fixtures/InvokableExtendingCommandTestCommand.php
new file mode 100644
index 000000000..724951608
--- /dev/null
+++ b/Tests/Fixtures/InvokableExtendingCommandTestCommand.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Fixtures;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+
+#[AsCommand('invokable:test')]
+class InvokableExtendingCommandTestCommand extends Command
+{
+    public function __invoke(): int
+    {
+        return Command::SUCCESS;
+    }
+}
diff --git a/Tests/Fixtures/InvokableTestCommand.php b/Tests/Fixtures/InvokableTestCommand.php
new file mode 100644
index 000000000..7c6d75d47
--- /dev/null
+++ b/Tests/Fixtures/InvokableTestCommand.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Fixtures;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+
+#[AsCommand('invokable:test', aliases: ['inv-test'], usages: ['usage1', 'usage2'], description: 'desc', help: 'help me')]
+class InvokableTestCommand
+{
+    public function __invoke(): int
+    {
+        return Command::SUCCESS;
+    }
+}
diff --git a/Tests/Fixtures/InvokableWithInputTestCommand.php b/Tests/Fixtures/InvokableWithInputTestCommand.php
new file mode 100644
index 000000000..e3a336642
--- /dev/null
+++ b/Tests/Fixtures/InvokableWithInputTestCommand.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Fixtures;
+
+use Symfony\Component\Console\Attribute\Argument;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Attribute\Input;
+use Symfony\Component\Console\Attribute\Option;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+#[AsCommand('invokable:input:test')]
+class InvokableWithInputTestCommand
+{
+    public function __invoke(SymfonyStyle $io, #[Input] UserDto $user): int
+    {
+        $io->writeln($user->name);
+        $io->writeln($user->email);
+        $io->writeln($user->password);
+        $io->writeln($user->admin ? 'yes' : 'no');
+        $io->writeln($user->active ? 'yes' : 'no');
+        $io->writeln($user->status->value);
+        $io->writeln($user->group->name);
+        $io->writeln($user->group->description);
+
+        return Command::SUCCESS;
+    }
+}
+
+final class UserDto
+{
+    #[Argument(name: 'username')]
+    public string $name;
+
+    #[Argument]
+    public string $email;
+
+    #[Argument]
+    public string $password;
+
+    #[Input]
+    public UserGroupDto $group;
+
+    #[Option]
+    public bool $admin = false;
+
+    #[Option]
+    public bool $active = true;
+
+    #[Option]
+    public UserStatus $status = UserStatus::Unverified;
+}
+
+final class UserGroupDto
+{
+    #[Option(name: 'group')]
+    public string $name = 'users';
+
+    #[Option(name: 'group-description')]
+    public string $description = 'Standard Users';
+}
+
+enum UserStatus: string
+{
+    case Unverified = 'unverified';
+    case Verified = 'verified';
+    case Locked = 'locked';
+}
diff --git a/Tests/Fixtures/application_1.json b/Tests/Fixtures/application_1.json
index 1477659ad..f57158512 100644
--- a/Tests/Fixtures/application_1.json
+++ b/Tests/Fixtures/application_1.json
@@ -241,7 +241,7 @@
                 "help [--format FORMAT] [--raw] [--] [<command_name>]"
             ],
             "description": "Display help for a command",
-            "help": "The <info>help<\/info> command displays help for a given command:\n\n  <info>%%PHP_SELF%% help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n  <info>%%PHP_SELF%% help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.",
+            "help": "The <info>help<\/info> command displays help for a given command:\n\n  <info>%%PHP_SELF%% help list<\/info>\n\nYou can also output the help in other formats by using the <info>--format<\/info> option:\n\n  <info>%%PHP_SELF%% help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.",
             "definition": {
                 "arguments": {
                     "command_name": {
@@ -353,7 +353,7 @@
                 "list [--raw] [--format FORMAT] [--short] [--] [<namespace>]"
             ],
             "description": "List commands",
-            "help": "The <info>list<\/info> command lists all commands:\n\n  <info>%%PHP_SELF%% list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>%%PHP_SELF%% list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n  <info>%%PHP_SELF%% list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>%%PHP_SELF%% list --raw<\/info>",
+            "help": "The <info>list<\/info> command lists all commands:\n\n  <info>%%PHP_SELF%% list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>%%PHP_SELF%% list test<\/info>\n\nYou can also output the information in other formats by using the <info>--format<\/info> option:\n\n  <info>%%PHP_SELF%% list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>%%PHP_SELF%% list --raw<\/info>",
             "definition": {
                 "arguments": {
                     "namespace": {
diff --git a/Tests/Fixtures/application_1.xml b/Tests/Fixtures/application_1.xml
index d726cee35..e1ca6938f 100644
--- a/Tests/Fixtures/application_1.xml
+++ b/Tests/Fixtures/application_1.xml
@@ -106,7 +106,7 @@
  
    &lt;info&gt;%%PHP_SELF%% help list&lt;/info&gt;
  
- You can also output the help in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ You can also output the help in other formats by using the &lt;info&gt;--format&lt;/info&gt; option:
  
    &lt;info&gt;%%PHP_SELF%% help --format=xml list&lt;/info&gt;
  
@@ -168,7 +168,7 @@
  
    &lt;info&gt;%%PHP_SELF%% list test&lt;/info&gt;
  
- You can also output the information in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ You can also output the information in other formats by using the &lt;info&gt;--format&lt;/info&gt; option:
  
    &lt;info&gt;%%PHP_SELF%% list --format=xml&lt;/info&gt;
  
diff --git a/Tests/Fixtures/application_2.json b/Tests/Fixtures/application_2.json
index c0e66444e..8876099cb 100644
--- a/Tests/Fixtures/application_2.json
+++ b/Tests/Fixtures/application_2.json
@@ -245,7 +245,7 @@
                 "help [--format FORMAT] [--raw] [--] [<command_name>]"
             ],
             "description": "Display help for a command",
-            "help": "The <info>help<\/info> command displays help for a given command:\n\n  <info>%%PHP_SELF%% help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n  <info>%%PHP_SELF%% help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.",
+            "help": "The <info>help<\/info> command displays help for a given command:\n\n  <info>%%PHP_SELF%% help list<\/info>\n\nYou can also output the help in other formats by using the <info>--format<\/info> option:\n\n  <info>%%PHP_SELF%% help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.",
             "definition": {
                 "arguments": {
                     "command_name": {
@@ -357,7 +357,7 @@
                 "list [--raw] [--format FORMAT] [--short] [--] [<namespace>]"
             ],
             "description": "List commands",
-            "help": "The <info>list<\/info> command lists all commands:\n\n  <info>%%PHP_SELF%% list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>%%PHP_SELF%% list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n  <info>%%PHP_SELF%% list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>%%PHP_SELF%% list --raw<\/info>",
+            "help": "The <info>list<\/info> command lists all commands:\n\n  <info>%%PHP_SELF%% list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>%%PHP_SELF%% list test<\/info>\n\nYou can also output the information in other formats by using the <info>--format<\/info> option:\n\n  <info>%%PHP_SELF%% list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>%%PHP_SELF%% list --raw<\/info>",
             "definition": {
                 "arguments": {
                     "namespace": {
diff --git a/Tests/Fixtures/application_2.xml b/Tests/Fixtures/application_2.xml
index dd4b1800a..5ce483ed6 100644
--- a/Tests/Fixtures/application_2.xml
+++ b/Tests/Fixtures/application_2.xml
@@ -106,7 +106,7 @@
  
    &lt;info&gt;%%PHP_SELF%% help list&lt;/info&gt;
  
- You can also output the help in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ You can also output the help in other formats by using the &lt;info&gt;--format&lt;/info&gt; option:
  
    &lt;info&gt;%%PHP_SELF%% help --format=xml list&lt;/info&gt;
  
@@ -168,7 +168,7 @@
  
    &lt;info&gt;%%PHP_SELF%% list test&lt;/info&gt;
  
- You can also output the information in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ You can also output the information in other formats by using the &lt;info&gt;--format&lt;/info&gt; option:
  
    &lt;info&gt;%%PHP_SELF%% list --format=xml&lt;/info&gt;
  
diff --git a/Tests/Formatter/OutputFormatterTest.php b/Tests/Formatter/OutputFormatterTest.php
index 489108bd5..963ed98b6 100644
--- a/Tests/Formatter/OutputFormatterTest.php
+++ b/Tests/Formatter/OutputFormatterTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Formatter;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
@@ -159,9 +160,7 @@ public function testInlineStyle()
         $this->assertEquals("\033[34;41msome text\033[39;49m", $formatter->format('<fg=blue;bg=red>some text</fg=blue;bg=red>'));
     }
 
-    /**
-     * @dataProvider provideInlineStyleOptionsCases
-     */
+    #[DataProvider('provideInlineStyleOptionsCases')]
     public function testInlineStyleOptions(string $tag, ?string $expected = null, ?string $input = null, bool $truecolor = false)
     {
         if ($truecolor && 'truecolor' !== getenv('COLORTERM')) {
@@ -177,7 +176,7 @@ public function testInlineStyleOptions(string $tag, ?string $expected = null, ?s
             $expected = $tag.$input.'</'.$styleString.'>';
             $this->assertSame($expected, $formatter->format($expected));
         } else {
-            /** @var OutputFormatterStyle $result */
+            /* @var OutputFormatterStyle $result */
             $this->assertInstanceOf(OutputFormatterStyle::class, $result);
             $this->assertSame($expected, $formatter->format($tag.$input.'</>'));
             $this->assertSame($expected, $formatter->format($tag.$input.'</'.$styleString.'>'));
@@ -241,9 +240,7 @@ public function testFormatterHasStyles()
         $this->assertTrue($formatter->hasStyle('question'));
     }
 
-    /**
-     * @dataProvider provideDecoratedAndNonDecoratedOutput
-     */
+    #[DataProvider('provideDecoratedAndNonDecoratedOutput')]
     public function testNotDecoratedFormatterOnJediTermEmulator(string $input, string $expectedNonDecoratedOutput, string $expectedDecoratedOutput, bool $shouldBeJediTerm = false)
     {
         $terminalEmulator = $shouldBeJediTerm ? 'JetBrains-JediTerm' : 'Unknown';
@@ -259,9 +256,7 @@ public function testNotDecoratedFormatterOnJediTermEmulator(string $input, strin
         }
     }
 
-    /**
-     * @dataProvider provideDecoratedAndNonDecoratedOutput
-     */
+    #[DataProvider('provideDecoratedAndNonDecoratedOutput')]
     public function testNotDecoratedFormatterOnIDEALikeEnvironment(string $input, string $expectedNonDecoratedOutput, string $expectedDecoratedOutput, bool $expectsIDEALikeTerminal = false)
     {
         // Backup previous env variable
@@ -307,50 +302,54 @@ public function testContentWithLineBreaks()
         $formatter = new OutputFormatter(true);
 
         $this->assertEquals(<<<EOF
-\033[32m
-some text\033[39m
-EOF
-            , $formatter->format(<<<'EOF'
-<info>
-some text</info>
-EOF
-            ));
+            \033[32m
+            some text\033[39m
+            EOF,
+            $formatter->format(<<<'EOF'
+                <info>
+                some text</info>
+                EOF
+            )
+        );
 
         $this->assertEquals(<<<EOF
-\033[32msome text
-\033[39m
-EOF
-            , $formatter->format(<<<'EOF'
-<info>some text
-</info>
-EOF
-            ));
+            \033[32msome text
+            \033[39m
+            EOF,
+            $formatter->format(<<<'EOF'
+                <info>some text
+                </info>
+                EOF
+            )
+        );
 
         $this->assertEquals(<<<EOF
-\033[32m
-some text
-\033[39m
-EOF
-            , $formatter->format(<<<'EOF'
-<info>
-some text
-</info>
-EOF
-            ));
+            \033[32m
+            some text
+            \033[39m
+            EOF,
+            $formatter->format(<<<'EOF'
+                <info>
+                some text
+                </info>
+                EOF
+            )
+        );
 
         $this->assertEquals(<<<EOF
-\033[32m
-some text
-more text
-\033[39m
-EOF
-            , $formatter->format(<<<'EOF'
-<info>
-some text
-more text
-</info>
-EOF
-            ));
+            \033[32m
+            some text
+            more text
+            \033[39m
+            EOF,
+            $formatter->format(<<<'EOF'
+                <info>
+                some text
+                more text
+                </info>
+                EOF
+            )
+        );
     }
 
     public function testFormatAndWrap()
diff --git a/Tests/Helper/DumperNativeFallbackTest.php b/Tests/Helper/DumperNativeFallbackTest.php
index 1b37e4e93..892590dd7 100644
--- a/Tests/Helper/DumperNativeFallbackTest.php
+++ b/Tests/Helper/DumperNativeFallbackTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\ClassExistsMock;
 use Symfony\Component\Console\Helper\Dumper;
@@ -32,9 +33,7 @@ public static function tearDownAfterClass(): void
         ClassExistsMock::withMockedClasses([]);
     }
 
-    /**
-     * @dataProvider provideVariables
-     */
+    #[DataProvider('provideVariables')]
     public function testInvoke($variable, $primitiveString)
     {
         $dumper = new Dumper($this->createMock(OutputInterface::class));
diff --git a/Tests/Helper/DumperTest.php b/Tests/Helper/DumperTest.php
index 0a30c6ec3..344d3f4dc 100644
--- a/Tests/Helper/DumperTest.php
+++ b/Tests/Helper/DumperTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Helper\Dumper;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -32,9 +33,7 @@ public static function tearDownAfterClass(): void
         putenv('DUMP_COMMA_SEPARATOR');
     }
 
-    /**
-     * @dataProvider provideVariables
-     */
+    #[DataProvider('provideVariables')]
     public function testInvoke($variable)
     {
         $output = $this->createMock(OutputInterface::class);
diff --git a/Tests/Helper/HelperTest.php b/Tests/Helper/HelperTest.php
index 009864454..95d5ee5d3 100644
--- a/Tests/Helper/HelperTest.php
+++ b/Tests/Helper/HelperTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Helper;
@@ -61,17 +62,13 @@ public static function decoratedTextProvider()
         ];
     }
 
-    /**
-     * @dataProvider formatTimeProvider
-     */
+    #[DataProvider('formatTimeProvider')]
     public function testFormatTime(int|float $secs, string $expectedFormat, int $precision)
     {
         $this->assertEquals($expectedFormat, Helper::formatTime($secs, $precision));
     }
 
-    /**
-     * @dataProvider decoratedTextProvider
-     */
+    #[DataProvider('decoratedTextProvider')]
     public function testRemoveDecoration(string $decoratedText, string $undecoratedText)
     {
         $this->assertEquals($undecoratedText, Helper::removeDecoration(new OutputFormatter(), $decoratedText));
diff --git a/Tests/Helper/OutputWrapperTest.php b/Tests/Helper/OutputWrapperTest.php
index 2ce15b6d4..e55221048 100644
--- a/Tests/Helper/OutputWrapperTest.php
+++ b/Tests/Helper/OutputWrapperTest.php
@@ -11,14 +11,13 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Helper\OutputWrapper;
 
 class OutputWrapperTest extends TestCase
 {
-    /**
-     * @dataProvider textProvider
-     */
+    #[DataProvider('textProvider')]
     public function testBasicWrap(string $text, int $width, bool $allowCutUrls, string $expected)
     {
         $wrapper = new OutputWrapper($allowCutUrls);
@@ -35,18 +34,18 @@ public static function textProvider(): iterable
             20,
             false,
             <<<'EOS'
-            Árvíztűrőtükörfúrógé
-            p https://github.com/symfony/symfony Lorem ipsum
-            <comment>dolor</comment> sit amet,
-            consectetur
-            adipiscing elit.
-            Praesent vestibulum
-            nulla quis urna
-            maximus porttitor.
-            Donec ullamcorper
-            risus at <error>libero
-            ornare</error> efficitur.
-            EOS,
+                Árvíztűrőtükörfúrógé
+                p https://github.com/symfony/symfony Lorem ipsum
+                <comment>dolor</comment> sit amet,
+                consectetur
+                adipiscing elit.
+                Praesent vestibulum
+                nulla quis urna
+                maximus porttitor.
+                Donec ullamcorper
+                risus at <error>libero
+                ornare</error> efficitur.
+                EOS,
         ];
 
         yield 'Allow URL cut' => [
@@ -54,20 +53,20 @@ public static function textProvider(): iterable
             20,
             true,
             <<<'EOS'
-            Árvíztűrőtükörfúrógé
-            p
-            https://github.com/s
-            ymfony/symfony Lorem
-            ipsum <comment>dolor</comment> sit
-            amet, consectetur
-            adipiscing elit.
-            Praesent vestibulum
-            nulla quis urna
-            maximus porttitor.
-            Donec ullamcorper
-            risus at <error>libero
-            ornare</error> efficitur.
-            EOS,
+                Árvíztűrőtükörfúrógé
+                p
+                https://github.com/s
+                ymfony/symfony Lorem
+                ipsum <comment>dolor</comment> sit
+                amet, consectetur
+                adipiscing elit.
+                Praesent vestibulum
+                nulla quis urna
+                maximus porttitor.
+                Donec ullamcorper
+                risus at <error>libero
+                ornare</error> efficitur.
+                EOS,
         ];
     }
 }
diff --git a/Tests/Helper/ProcessHelperTest.php b/Tests/Helper/ProcessHelperTest.php
index 1fd88987b..38a6d543f 100644
--- a/Tests/Helper/ProcessHelperTest.php
+++ b/Tests/Helper/ProcessHelperTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Helper\DebugFormatterHelper;
 use Symfony\Component\Console\Helper\HelperSet;
@@ -20,9 +21,7 @@
 
 class ProcessHelperTest extends TestCase
 {
-    /**
-     * @dataProvider provideCommandsAndOutput
-     */
+    #[DataProvider('provideCommandsAndOutput')]
     public function testVariousProcessRuns(string $expected, Process|string|array $cmd, int $verbosity, ?string $error)
     {
         if (\is_string($cmd)) {
@@ -52,48 +51,48 @@ public function testPassedCallbackIsExecuted()
     public static function provideCommandsAndOutput(): array
     {
         $successOutputVerbose = <<<'EOT'
-  RUN  php -r "echo 42;"
-  RES  Command ran successfully
+              RUN  php -r "echo 42;"
+              RES  Command ran successfully
 
-EOT;
+            EOT;
         $successOutputDebug = <<<'EOT'
-  RUN  php -r "echo 42;"
-  OUT  42
-  RES  Command ran successfully
+              RUN  php -r "echo 42;"
+              OUT  42
+              RES  Command ran successfully
 
-EOT;
+            EOT;
         $successOutputDebugWithTags = <<<'EOT'
-  RUN  php -r "echo '<info>42</info>';"
-  OUT  <info>42</info>
-  RES  Command ran successfully
+              RUN  php -r "echo '<info>42</info>';"
+              OUT  <info>42</info>
+              RES  Command ran successfully
 
-EOT;
+            EOT;
         $successOutputProcessDebug = <<<'EOT'
-  RUN  'php' '-r' 'echo 42;'
-  OUT  42
-  RES  Command ran successfully
+              RUN  'php' '-r' 'echo 42;'
+              OUT  42
+              RES  Command ran successfully
 
-EOT;
+            EOT;
         $syntaxErrorOutputVerbose = <<<'EOT'
-  RUN  php -r "fwrite(STDERR, 'error message');usleep(50000);fwrite(STDOUT, 'out message');exit(252);"
-  RES  252 Command did not run successfully
+              RUN  php -r "fwrite(STDERR, 'error message');usleep(50000);fwrite(STDOUT, 'out message');exit(252);"
+              RES  252 Command did not run successfully
 
-EOT;
+            EOT;
         $syntaxErrorOutputDebug = <<<'EOT'
-  RUN  php -r "fwrite(STDERR, 'error message');usleep(500000);fwrite(STDOUT, 'out message');exit(252);"
-  ERR  error message
-  OUT  out message
-  RES  252 Command did not run successfully
+              RUN  php -r "fwrite(STDERR, 'error message');usleep(500000);fwrite(STDOUT, 'out message');exit(252);"
+              ERR  error message
+              OUT  out message
+              RES  252 Command did not run successfully
 
-EOT;
+            EOT;
 
         $PHP = '\\' === \DIRECTORY_SEPARATOR ? '"!PHP!"' : '"$PHP"';
         $successOutputPhp = <<<EOT
-  RUN  php -r $PHP
-  OUT  42
-  RES  Command ran successfully
+              RUN  php -r $PHP
+              OUT  42
+              RES  Command ran successfully
 
-EOT;
+            EOT;
 
         $errorMessage = 'An error occurred';
         $args = new Process(['php', '-r', 'echo 42;']);
diff --git a/Tests/Helper/ProgressBarTest.php b/Tests/Helper/ProgressBarTest.php
index c0278cc33..683bc7c87 100644
--- a/Tests/Helper/ProgressBarTest.php
+++ b/Tests/Helper/ProgressBarTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Helper;
@@ -18,9 +20,7 @@
 use Symfony\Component\Console\Output\ConsoleSectionOutput;
 use Symfony\Component\Console\Output\StreamOutput;
 
-/**
- * @group time-sensitive
- */
+#[Group('time-sensitive')]
 class ProgressBarTest extends TestCase
 {
     private string|false $colSize;
@@ -1117,9 +1117,7 @@ public function testUnicode()
         $bar->finish();
     }
 
-    /**
-     * @dataProvider provideFormat
-     */
+    #[DataProvider('provideFormat')]
     public function testFormatsWithoutMax($format)
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 0, 0);
diff --git a/Tests/Helper/ProgressIndicatorTest.php b/Tests/Helper/ProgressIndicatorTest.php
index 2a4441d57..fb11d1432 100644
--- a/Tests/Helper/ProgressIndicatorTest.php
+++ b/Tests/Helper/ProgressIndicatorTest.php
@@ -11,13 +11,13 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Helper\ProgressIndicator;
 use Symfony\Component\Console\Output\StreamOutput;
 
-/**
- * @group time-sensitive
- */
+#[Group('time-sensitive')]
 class ProgressIndicatorTest extends TestCase
 {
     public function testDefaultIndicator()
@@ -176,9 +176,7 @@ public function testCannotFinishUnstartedIndicator()
         $bar->finish('Finished');
     }
 
-    /**
-     * @dataProvider provideFormat
-     */
+    #[DataProvider('provideFormat')]
     public function testFormats($format)
     {
         $bar = new ProgressIndicator($output = $this->getOutputStream(), $format);
diff --git a/Tests/Helper/QuestionHelperTest.php b/Tests/Helper/QuestionHelperTest.php
index 76e40cef0..be109d9fe 100644
--- a/Tests/Helper/QuestionHelperTest.php
+++ b/Tests/Helper/QuestionHelperTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\MissingInputException;
@@ -27,9 +29,7 @@
 use Symfony\Component\Console\Terminal;
 use Symfony\Component\Console\Tester\ApplicationTester;
 
-/**
- * @group tty
- */
+#[Group('tty')]
 class QuestionHelperTest extends AbstractQuestionHelperTestCase
 {
     public function testAskChoice()
@@ -186,6 +186,45 @@ public function testAskNonTrimmed()
         $this->assertEquals('What time is it?', stream_get_contents($output->getStream()));
     }
 
+    public function testAskTimeout()
+    {
+        $dialog = new QuestionHelper();
+
+        $question = new Question('What is your name?');
+        $question->setTimeout(1);
+
+        $this->expectException(MissingInputException::class);
+        $this->expectExceptionMessage('Timed out after waiting for input for 1 second.');
+
+        try {
+            $startTime = microtime(true);
+            $dialog->ask($this->createStreamableInputInterfaceMock(\STDIN), $this->createOutputInterface(), $question);
+        } finally {
+            $elapsedTime = microtime(true) - $startTime;
+            self::assertGreaterThanOrEqual(1, $elapsedTime, 'The question should timeout after 1 second');
+        }
+    }
+
+    public function testAskTimeoutWithIncompatibleStream()
+    {
+        $dialog = new QuestionHelper();
+        $inputStream = $this->getInputStream('');
+
+        $question = new Question('What is your name?');
+        $question->setTimeout(1);
+
+        $this->expectException(MissingInputException::class);
+        $this->expectExceptionMessage('Aborted.');
+
+        try {
+            $startTime = microtime(true);
+            $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question);
+        } finally {
+            $elapsedTime = microtime(true) - $startTime;
+            self::assertLessThan(1, $elapsedTime, 'Question should not wait for input on a non-interactive stream');
+        }
+    }
+
     public function testAskWithAutocomplete()
     {
         if (!Terminal::hasSttyAvailable()) {
@@ -348,9 +387,7 @@ public static function getInputs()
         ];
     }
 
-    /**
-     * @dataProvider getInputs
-     */
+    #[DataProvider('getInputs')]
     public function testAskWithAutocompleteWithMultiByteCharacter($character)
     {
         if (!Terminal::hasSttyAvailable()) {
@@ -446,14 +483,14 @@ public function testAskHiddenResponseNotTrimmed()
     public function testAskMultilineResponseWithEOF()
     {
         $essay = <<<'EOD'
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque pretium lectus quis suscipit porttitor. Sed pretium bibendum vestibulum.
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque pretium lectus quis suscipit porttitor. Sed pretium bibendum vestibulum.
 
-Etiam accumsan, justo vitae imperdiet aliquet, neque est sagittis mauris, sed interdum massa leo id leo.
+            Etiam accumsan, justo vitae imperdiet aliquet, neque est sagittis mauris, sed interdum massa leo id leo.
 
-Aliquam rhoncus, libero ac blandit convallis, est sapien hendrerit nulla, vitae aliquet tellus orci a odio. Aliquam gravida ante sit amet massa lacinia, ut condimentum purus venenatis.
+            Aliquam rhoncus, libero ac blandit convallis, est sapien hendrerit nulla, vitae aliquet tellus orci a odio. Aliquam gravida ante sit amet massa lacinia, ut condimentum purus venenatis.
 
-Vivamus et erat dictum, euismod neque in, laoreet odio. Aenean vitae tellus at leo vestibulum auctor id eget urna.
-EOD;
+            Vivamus et erat dictum, euismod neque in, laoreet odio. Aenean vitae tellus at leo vestibulum auctor id eget urna.
+            EOD;
 
         $response = $this->getInputStream($essay);
 
@@ -505,11 +542,11 @@ public function testAskMultilineResponseWithMultipleNewlinesAtEnd()
     public function testAskMultilineResponseWithWithCursorInMiddleOfSeekableInputStream()
     {
         $input = <<<EOD
-This
-is
-some
-input
-EOD;
+            This
+            is
+            some
+            input
+            EOD;
         $response = $this->getInputStream($input);
         fseek($response, 8);
 
@@ -522,9 +559,7 @@ public function testAskMultilineResponseWithWithCursorInMiddleOfSeekableInputStr
         $this->assertSame(18, ftell($response));
     }
 
-    /**
-     * @dataProvider getAskConfirmationData
-     */
+    #[DataProvider('getAskConfirmationData')]
     public function testAskConfirmation($question, $expected, $default = true)
     {
         $dialog = new QuestionHelper();
@@ -565,7 +600,7 @@ public function testAskAndValidate()
 
         $error = 'This is not a color!';
         $validator = function ($color) use ($error) {
-            if (!\in_array($color, ['white', 'black'])) {
+            if (!\in_array($color, ['white', 'black'], true)) {
                 throw new \InvalidArgumentException($error);
             }
 
@@ -588,9 +623,7 @@ public function testAskAndValidate()
         }
     }
 
-    /**
-     * @dataProvider simpleAnswerProvider
-     */
+    #[DataProvider('simpleAnswerProvider')]
     public function testSelectChoiceFromSimpleChoices($providedAnswer, $expectedValue)
     {
         $possibleChoices = [
@@ -622,9 +655,7 @@ public static function simpleAnswerProvider()
         ];
     }
 
-    /**
-     * @dataProvider specialCharacterInMultipleChoice
-     */
+    #[DataProvider('specialCharacterInMultipleChoice')]
     public function testSpecialCharacterChoiceFromMultipleChoiceList($providedAnswer, $expectedValue)
     {
         $possibleChoices = [
@@ -653,9 +684,7 @@ public static function specialCharacterInMultipleChoice()
         ];
     }
 
-    /**
-     * @dataProvider answerProvider
-     */
+    #[DataProvider('answerProvider')]
     public function testSelectChoiceFromChoiceList($providedAnswer, $expectedValue)
     {
         $possibleChoices = [
@@ -750,7 +779,7 @@ public function testAskThrowsExceptionOnMissingInput()
     public function testAskThrowsExceptionOnMissingInputForChoiceQuestion()
     {
         $this->expectException(MissingInputException::class);
-        $this->expectExceptionMessage('Aborted.');
+        $this->expectExceptionMessage('Aborted while asking: Choice');
         (new QuestionHelper())->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new ChoiceQuestion('Choice', ['a', 'b']));
     }
 
diff --git a/Tests/Helper/SymfonyQuestionHelperTest.php b/Tests/Helper/SymfonyQuestionHelperTest.php
index 6cf79965b..765691d01 100644
--- a/Tests/Helper/SymfonyQuestionHelperTest.php
+++ b/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\Group;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Helper\HelperSet;
@@ -20,9 +21,7 @@
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\Question;
 
-/**
- * @group tty
- */
+#[Group('tty')]
 class SymfonyQuestionHelperTest extends AbstractQuestionHelperTestCase
 {
     public function testAskChoice()
@@ -155,13 +154,15 @@ public function testChoiceQuestionPadding()
         );
 
         $this->assertOutputContains(<<<EOT
- qqq:
-  [foo   ] foo
-  [żółw  ] bar
-  [łabądź] baz
- >
-EOT
-            , $output, true);
+             qqq:
+              [foo   ] foo
+              [żółw  ] bar
+              [łabądź] baz
+             >
+            EOT,
+            $output,
+            true
+        );
     }
 
     public function testChoiceQuestionCustomPrompt()
@@ -176,11 +177,13 @@ public function testChoiceQuestionCustomPrompt()
         );
 
         $this->assertOutputContains(<<<EOT
- qqq:
-  [0] foo
- >ccc>
-EOT
-            , $output, true);
+             qqq:
+              [0] foo
+             >ccc>
+            EOT,
+            $output,
+            true
+        );
     }
 
     protected function getInputStream($input)
diff --git a/Tests/Helper/TableTest.php b/Tests/Helper/TableTest.php
index eb85364da..b6f57f560 100644
--- a/Tests/Helper/TableTest.php
+++ b/Tests/Helper/TableTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\RuntimeException;
@@ -38,9 +39,7 @@ protected function tearDown(): void
         unset($this->stream);
     }
 
-    /**
-     * @dataProvider renderProvider
-     */
+    #[DataProvider('renderProvider')]
     public function testRender($headers, $rows, $style, $expected, $decorated = false)
     {
         $table = new Table($output = $this->getOutputStream($decorated));
@@ -54,9 +53,7 @@ public function testRender($headers, $rows, $style, $expected, $decorated = fals
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
 
-    /**
-     * @dataProvider renderProvider
-     */
+    #[DataProvider('renderProvider')]
     public function testRenderAddRows($headers, $rows, $style, $expected, $decorated = false)
     {
         $table = new Table($output = $this->getOutputStream($decorated));
@@ -70,9 +67,7 @@ public function testRenderAddRows($headers, $rows, $style, $expected, $decorated
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
 
-    /**
-     * @dataProvider renderProvider
-     */
+    #[DataProvider('renderProvider')]
     public function testRenderAddRowsOneByOne($headers, $rows, $style, $expected, $decorated = false)
     {
         $table = new Table($output = $this->getOutputStream($decorated));
@@ -103,30 +98,30 @@ public static function renderProvider()
                 $books,
                 'default',
                 <<<'TABLE'
-+---------------+--------------------------+------------------+
-| ISBN          | Title                    | Author           |
-+---------------+--------------------------+------------------+
-| 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
-| 9971-5-0210-0 | A Tale of Two Cities     | Charles Dickens  |
-| 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
-| 80-902734-1-6 | And Then There Were None | Agatha Christie  |
-+---------------+--------------------------+------------------+
-
-TABLE,
+                    +---------------+--------------------------+------------------+
+                    | ISBN          | Title                    | Author           |
+                    +---------------+--------------------------+------------------+
+                    | 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
+                    | 9971-5-0210-0 | A Tale of Two Cities     | Charles Dickens  |
+                    | 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
+                    | 80-902734-1-6 | And Then There Were None | Agatha Christie  |
+                    +---------------+--------------------------+------------------+
+
+                    TABLE,
             ],
             [
                 ['ISBN', 'Title', 'Author'],
                 $books,
                 'markdown',
                 <<<'TABLE'
-| ISBN          | Title                    | Author           |
-|---------------|--------------------------|------------------|
-| 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
-| 9971-5-0210-0 | A Tale of Two Cities     | Charles Dickens  |
-| 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
-| 80-902734-1-6 | And Then There Were None | Agatha Christie  |
-
-TABLE,
+                    | ISBN          | Title                    | Author           |
+                    |---------------|--------------------------|------------------|
+                    | 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
+                    | 9971-5-0210-0 | A Tale of Two Cities     | Charles Dickens  |
+                    | 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
+                    | 80-902734-1-6 | And Then There Were None | Agatha Christie  |
+
+                    TABLE,
             ],
             [
                 ['ISBN', 'Title', 'Author'],
@@ -162,16 +157,16 @@ public static function renderProvider()
                 $books,
                 'box',
                 <<<'TABLE'
-┌───────────────┬──────────────────────────┬──────────────────┐
-│ ISBN          │ Title                    │ Author           │
-├───────────────┼──────────────────────────┼──────────────────┤
-│ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  │
-│ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  │
-│ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien │
-│ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  │
-└───────────────┴──────────────────────────┴──────────────────┘
-
-TABLE,
+                    ┌───────────────┬──────────────────────────┬──────────────────┐
+                    │ ISBN          │ Title                    │ Author           │
+                    ├───────────────┼──────────────────────────┼──────────────────┤
+                    │ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  │
+                    │ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  │
+                    │ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien │
+                    │ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  │
+                    └───────────────┴──────────────────────────┴──────────────────┘
+
+                    TABLE,
             ],
             [
                 ['ISBN', 'Title', 'Author'],
@@ -184,17 +179,17 @@ public static function renderProvider()
                 ],
                 'box-double',
                 <<<'TABLE'
-╔═══════════════╤══════════════════════════╤══════════════════╗
-║ ISBN          │ Title                    │ Author           ║
-╠═══════════════╪══════════════════════════╪══════════════════╣
-║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
-║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
-╟───────────────┼──────────────────────────┼──────────────────╢
-║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
-║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
-╚═══════════════╧══════════════════════════╧══════════════════╝
-
-TABLE,
+                    ╔═══════════════╤══════════════════════════╤══════════════════╗
+                    ║ ISBN          │ Title                    │ Author           ║
+                    ╠═══════════════╪══════════════════════════╪══════════════════╣
+                    ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
+                    ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
+                    ╟───────────────┼──────────────────────────┼──────────────────╢
+                    ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
+                    ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
+                    ╚═══════════════╧══════════════════════════╧══════════════════╝
+
+                    TABLE,
             ],
             [
                 ['ISBN', 'Title'],
@@ -206,16 +201,16 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+---------------+--------------------------+------------------+
-| ISBN          | Title                    |                  |
-+---------------+--------------------------+------------------+
-| 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
-| 9971-5-0210-0 |                          |                  |
-| 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
-| 80-902734-1-6 | And Then There Were None | Agatha Christie  |
-+---------------+--------------------------+------------------+
-
-TABLE,
+                    +---------------+--------------------------+------------------+
+                    | ISBN          | Title                    |                  |
+                    +---------------+--------------------------+------------------+
+                    | 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
+                    | 9971-5-0210-0 |                          |                  |
+                    | 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
+                    | 80-902734-1-6 | And Then There Were None | Agatha Christie  |
+                    +---------------+--------------------------+------------------+
+
+                    TABLE,
             ],
             [
                 [],
@@ -227,14 +222,14 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+---------------+--------------------------+------------------+
-| 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
-| 9971-5-0210-0 |                          |                  |
-| 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
-| 80-902734-1-6 | And Then There Were None | Agatha Christie  |
-+---------------+--------------------------+------------------+
-
-TABLE,
+                    +---------------+--------------------------+------------------+
+                    | 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
+                    | 9971-5-0210-0 |                          |                  |
+                    | 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
+                    | 80-902734-1-6 | And Then There Were None | Agatha Christie  |
+                    +---------------+--------------------------+------------------+
+
+                    TABLE,
             ],
             [
                 ['ISBN', 'Title', 'Author'],
@@ -246,31 +241,31 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+---------------+----------------------------+-----------------+
-| ISBN          | Title                      | Author          |
-+---------------+----------------------------+-----------------+
-| 99921-58-10-7 | Divine                     | Dante Alighieri |
-|               | Comedy                     |                 |
-| 9971-5-0210-2 | Harry Potter               | Rowling         |
-|               | and the Chamber of Secrets | Joanne K.       |
-| 9971-5-0210-2 | Harry Potter               | Rowling         |
-|               | and the Chamber of Secrets | Joanne K.       |
-| 960-425-059-0 | The Lord of the Rings      | J. R. R.        |
-|               |                            | Tolkien         |
-+---------------+----------------------------+-----------------+
-
-TABLE,
+                    +---------------+----------------------------+-----------------+
+                    | ISBN          | Title                      | Author          |
+                    +---------------+----------------------------+-----------------+
+                    | 99921-58-10-7 | Divine                     | Dante Alighieri |
+                    |               | Comedy                     |                 |
+                    | 9971-5-0210-2 | Harry Potter               | Rowling         |
+                    |               | and the Chamber of Secrets | Joanne K.       |
+                    | 9971-5-0210-2 | Harry Potter               | Rowling         |
+                    |               | and the Chamber of Secrets | Joanne K.       |
+                    | 960-425-059-0 | The Lord of the Rings      | J. R. R.        |
+                    |               |                            | Tolkien         |
+                    +---------------+----------------------------+-----------------+
+
+                    TABLE,
             ],
             [
                 ['ISBN', 'Title'],
                 [],
                 'default',
                 <<<'TABLE'
-+------+-------+
-| ISBN | Title |
-+------+-------+
+                    +------+-------+
+                    | ISBN | Title |
+                    +------+-------+
 
-TABLE,
+                    TABLE,
             ],
             [
                 [],
@@ -286,14 +281,14 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+---------------+----------------------+-----------------+
-| ISBN          | Title                | Author          |
-+---------------+----------------------+-----------------+
-| 99921-58-10-7 | Divine Comedy        | Dante Alighieri |
-| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
-+---------------+----------------------+-----------------+
-
-TABLE,
+                    +---------------+----------------------+-----------------+
+                    | ISBN          | Title                | Author          |
+                    +---------------+----------------------+-----------------+
+                    | 99921-58-10-7 | Divine Comedy        | Dante Alighieri |
+                    | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
+                    +---------------+----------------------+-----------------+
+
+                    TABLE,
             ],
             'Cell text with tags not used for Output styling' => [
                 ['ISBN', 'Title', 'Author'],
@@ -303,14 +298,14 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+----------------------------------+----------------------+-----------------+
-| ISBN                             | Title                | Author          |
-+----------------------------------+----------------------+-----------------+
-| <strong>99921-58-10-700</strong> | <f>Divine Com</f>    | Dante Alighieri |
-| 9971-5-0210-0                    | A Tale of Two Cities | Charles Dickens |
-+----------------------------------+----------------------+-----------------+
-
-TABLE,
+                    +----------------------------------+----------------------+-----------------+
+                    | ISBN                             | Title                | Author          |
+                    +----------------------------------+----------------------+-----------------+
+                    | <strong>99921-58-10-700</strong> | <f>Divine Com</f>    | Dante Alighieri |
+                    | 9971-5-0210-0                    | A Tale of Two Cities | Charles Dickens |
+                    +----------------------------------+----------------------+-----------------+
+
+                    TABLE,
             ],
             'Cell with colspan' => [
                 ['ISBN', 'Title', 'Author'],
@@ -335,22 +330,22 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+-------------------------------+-------------------------------+-----------------------------+
-| ISBN                          | Title                         | Author                      |
-+-------------------------------+-------------------------------+-----------------------------+
-| 99921-58-10-7                 | Divine Comedy                 | Dante Alighieri             |
-+-------------------------------+-------------------------------+-----------------------------+
-| Divine Comedy(Dante Alighieri)                                                              |
-+-------------------------------+-------------------------------+-----------------------------+
-| Arduino: A Quick-Start Guide                                  | Mark Schmidt                |
-+-------------------------------+-------------------------------+-----------------------------+
-| 9971-5-0210-0                 | A Tale of                                                   |
-|                               | Two Cities                                                  |
-+-------------------------------+-------------------------------+-----------------------------+
-| Cupìdĭtâte díctá âtquè pôrrò, tèmpórà exercitátìónèm mòdí ânìmí núllà nèmò vèl níhìl!       |
-+-------------------------------+-------------------------------+-----------------------------+
-
-TABLE,
+                    +-------------------------------+-------------------------------+-----------------------------+
+                    | ISBN                          | Title                         | Author                      |
+                    +-------------------------------+-------------------------------+-----------------------------+
+                    | 99921-58-10-7                 | Divine Comedy                 | Dante Alighieri             |
+                    +-------------------------------+-------------------------------+-----------------------------+
+                    | Divine Comedy(Dante Alighieri)                                                              |
+                    +-------------------------------+-------------------------------+-----------------------------+
+                    | Arduino: A Quick-Start Guide                                  | Mark Schmidt                |
+                    +-------------------------------+-------------------------------+-----------------------------+
+                    | 9971-5-0210-0                 | A Tale of                                                   |
+                    |                               | Two Cities                                                  |
+                    +-------------------------------+-------------------------------+-----------------------------+
+                    | Cupìdĭtâte díctá âtquè pôrrò, tèmpórà exercitátìónèm mòdí ânìmí núllà nèmò vèl níhìl!       |
+                    +-------------------------------+-------------------------------+-----------------------------+
+
+                    TABLE,
             ],
             'Cell after colspan contains new line break' => [
                 ['Foo', 'Bar', 'Baz'],
@@ -362,14 +357,14 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+-----+-----+-----+
-| Foo | Bar | Baz |
-+-----+-----+-----+
-| foo       | baz |
-| bar       | qux |
-+-----+-----+-----+
-
-TABLE,
+                    +-----+-----+-----+
+                    | Foo | Bar | Baz |
+                    +-----+-----+-----+
+                    | foo       | baz |
+                    | bar       | qux |
+                    +-----+-----+-----+
+
+                    TABLE,
             ],
             'Cell after colspan contains multiple new lines' => [
                 ['Foo', 'Bar', 'Baz'],
@@ -381,15 +376,15 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+-----+-----+------+
-| Foo | Bar | Baz  |
-+-----+-----+------+
-| foo       | baz  |
-| bar       | qux  |
-|           | quux |
-+-----+-----+------+
-
-TABLE,
+                    +-----+-----+------+
+                    | Foo | Bar | Baz  |
+                    +-----+-----+------+
+                    | foo       | baz  |
+                    | bar       | qux  |
+                    |           | quux |
+                    +-----+-----+------+
+
+                    TABLE,
             ],
             'Cell with rowspan' => [
                 ['ISBN', 'Title', 'Author'],
@@ -407,20 +402,20 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+---------------+---------------+-----------------+
-| ISBN          | Title         | Author          |
-+---------------+---------------+-----------------+
-| 9971-5-0210-0 | Divine Comedy | Dante Alighieri |
-|               |               |                 |
-|               | The Lord of   | J. R.           |
-|               | the Rings     | R. Tolkien      |
-+---------------+---------------+-----------------+
-| 80-902734-1-6 | And Then      | Agatha Christie |
-| 80-902734-1-7 | There         | Test            |
-|               | Were None     |                 |
-+---------------+---------------+-----------------+
-
-TABLE,
+                    +---------------+---------------+-----------------+
+                    | ISBN          | Title         | Author          |
+                    +---------------+---------------+-----------------+
+                    | 9971-5-0210-0 | Divine Comedy | Dante Alighieri |
+                    |               |               |                 |
+                    |               | The Lord of   | J. R.           |
+                    |               | the Rings     | R. Tolkien      |
+                    +---------------+---------------+-----------------+
+                    | 80-902734-1-6 | And Then      | Agatha Christie |
+                    | 80-902734-1-7 | There         | Test            |
+                    |               | Were None     |                 |
+                    +---------------+---------------+-----------------+
+
+                    TABLE,
             ],
             'Cell with rowspan and colspan' => [
                 ['ISBN', 'Title', 'Author'],
@@ -440,18 +435,18 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+------------------+---------+-----------------+
-| ISBN             | Title   | Author          |
-+------------------+---------+-----------------+
-| 9971-5-0210-0              | Dante Alighieri |
-|                            | Charles Dickens |
-+------------------+---------+-----------------+
-| Dante Alighieri  | 9971-5-0210-0             |
-| J. R. R. Tolkien |                           |
-| J. R. R          |                           |
-+------------------+---------+-----------------+
-
-TABLE,
+                    +------------------+---------+-----------------+
+                    | ISBN             | Title   | Author          |
+                    +------------------+---------+-----------------+
+                    | 9971-5-0210-0              | Dante Alighieri |
+                    |                            | Charles Dickens |
+                    +------------------+---------+-----------------+
+                    | Dante Alighieri  | 9971-5-0210-0             |
+                    | J. R. R. Tolkien |                           |
+                    | J. R. R          |                           |
+                    +------------------+---------+-----------------+
+
+                    TABLE,
             ],
             'Cell with rowspan and colspan contains new line break' => [
                 ['ISBN', 'Title', 'Author'],
@@ -475,26 +470,26 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+-----------------+-------+-----------------+
-| ISBN            | Title | Author          |
-+-----------------+-------+-----------------+
-| 9971                    | Dante Alighieri |
-| -5-                     | Charles Dickens |
-| 021                     |                 |
-| 0-0                     |                 |
-+-----------------+-------+-----------------+
-| Dante Alighieri | 9971                    |
-| Charles Dickens | -5-                     |
-|                 | 021                     |
-|                 | 0-0                     |
-+-----------------+-------+-----------------+
-| 9971                    | Dante           |
-| -5-                     | Alighieri       |
-| 021                     |                 |
-| 0-0                     |                 |
-+-----------------+-------+-----------------+
-
-TABLE,
+                    +-----------------+-------+-----------------+
+                    | ISBN            | Title | Author          |
+                    +-----------------+-------+-----------------+
+                    | 9971                    | Dante Alighieri |
+                    | -5-                     | Charles Dickens |
+                    | 021                     |                 |
+                    | 0-0                     |                 |
+                    +-----------------+-------+-----------------+
+                    | Dante Alighieri | 9971                    |
+                    | Charles Dickens | -5-                     |
+                    |                 | 021                     |
+                    |                 | 0-0                     |
+                    +-----------------+-------+-----------------+
+                    | 9971                    | Dante           |
+                    | -5-                     | Alighieri       |
+                    | 021                     |                 |
+                    | 0-0                     |                 |
+                    +-----------------+-------+-----------------+
+
+                    TABLE,
             ],
             'Cell with rowspan and colspan without using TableSeparator' => [
                 ['ISBN', 'Title', 'Author'],
@@ -512,20 +507,20 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+-----------------+-------+-----------------+
-| ISBN            | Title | Author          |
-+-----------------+-------+-----------------+
-| 9971                    | Dante Alighieri |
-| -5-                     | Charles Dickens |
-| 021                     |                 |
-| 0-0                     |                 |
-| Dante Alighieri | 9971                    |
-| Charles Dickens | -5-                     |
-|                 | 021                     |
-|                 | 0-0                     |
-+-----------------+-------+-----------------+
-
-TABLE,
+                    +-----------------+-------+-----------------+
+                    | ISBN            | Title | Author          |
+                    +-----------------+-------+-----------------+
+                    | 9971                    | Dante Alighieri |
+                    | -5-                     | Charles Dickens |
+                    | 021                     |                 |
+                    | 0-0                     |                 |
+                    | Dante Alighieri | 9971                    |
+                    | Charles Dickens | -5-                     |
+                    |                 | 021                     |
+                    |                 | 0-0                     |
+                    +-----------------+-------+-----------------+
+
+                    TABLE,
             ],
             'Cell with rowspan and colspan with separator inside a rowspan' => [
                 ['ISBN', 'Author'],
@@ -539,15 +534,15 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+---------------+-----------------+
-| ISBN          | Author          |
-+---------------+-----------------+
-| 9971-5-0210-0 | Dante Alighieri |
-|               |-----------------|
-|               | Charles Dickens |
-+---------------+-----------------+
-
-TABLE,
+                    +---------------+-----------------+
+                    | ISBN          | Author          |
+                    +---------------+-----------------+
+                    | 9971-5-0210-0 | Dante Alighieri |
+                    |               |-----------------|
+                    |               | Charles Dickens |
+                    +---------------+-----------------+
+
+                    TABLE,
             ],
             'Multiple header lines' => [
                 [
@@ -557,13 +552,13 @@ public static function renderProvider()
                 [],
                 'default',
                 <<<'TABLE'
-+------+-------+--------+
-| Main title            |
-+------+-------+--------+
-| ISBN | Title | Author |
-+------+-------+--------+
+                    +------+-------+--------+
+                    | Main title            |
+                    +------+-------+--------+
+                    | ISBN | Title | Author |
+                    +------+-------+--------+
 
-TABLE,
+                    TABLE,
             ],
             'Row with multiple cells' => [
                 [],
@@ -577,11 +572,11 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+---+--+--+---+--+---+--+---+--+
-| 1       | 2    | 3    | 4    |
-+---+--+--+---+--+---+--+---+--+
+                    +---+--+--+---+--+---+--+---+--+
+                    | 1       | 2    | 3    | 4    |
+                    +---+--+--+---+--+---+--+---+--+
 
-TABLE,
+                    TABLE,
             ],
             'Coslpan and table cells with comment style' => [
                 [
@@ -600,16 +595,15 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<TABLE
-+-----------------+------------------+---------+
-|\033[32m \033[39m\033[33mLong Title\033[39m\033[32m                                   \033[39m|
-+-----------------+------------------+---------+
-| 9971-5-0210-0                                |
-+-----------------+------------------+---------+
-| Dante Alighieri | J. R. R. Tolkien | J. R. R |
-+-----------------+------------------+---------+
-
-TABLE
-                ,
+                    +-----------------+------------------+---------+
+                    |\033[32m \033[39m\033[33mLong Title\033[39m\033[32m                                   \033[39m|
+                    +-----------------+------------------+---------+
+                    | 9971-5-0210-0                                |
+                    +-----------------+------------------+---------+
+                    | Dante Alighieri | J. R. R. Tolkien | J. R. R |
+                    +-----------------+------------------+---------+
+
+                    TABLE,
                 true,
             ],
             'Row with formatted cells containing a newline' => [
@@ -629,16 +623,15 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+-------+------------+
-| Dont break         |
-| here               |
-+-------+------------+
-| foo   | Dont break |
-| bar   | here       |
-+-------+------------+
-
-TABLE
-                ,
+                    +-------+------------+
+                    | Dont break         |
+                    | here               |
+                    +-------+------------+
+                    | foo   | Dont break |
+                    | bar   | here       |
+                    +-------+------------+
+
+                    TABLE,
                 true,
             ],
             'TabeCellStyle with align. Also with rowspan and colspan > 1' => [
@@ -709,18 +702,17 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+---------------+---------------+-------------------------------------------+
-|          ISBN | Title         |                  Author                   |
-+---------------+---------------+-------------------------------------------+
-|      978      | De Monarchia  |             Dante Alighieri               |
-| 99921-58-10-7 | Divine Comedy | spans multiple rows rows Dante Alighieri  |
-|               |               |         spans multiple rows rows          |
-+---------------+---------------+-------------------------------------------+
-|             test              |                                      tttt |
-+---------------+---------------+-------------------------------------------+
-
-TABLE
-                ,
+                    +---------------+---------------+-------------------------------------------+
+                    |          ISBN | Title         |                  Author                   |
+                    +---------------+---------------+-------------------------------------------+
+                    |      978      | De Monarchia  |             Dante Alighieri               |
+                    | 99921-58-10-7 | Divine Comedy | spans multiple rows rows Dante Alighieri  |
+                    |               |               |         spans multiple rows rows          |
+                    +---------------+---------------+-------------------------------------------+
+                    |             test              |                                      tttt |
+                    +---------------+---------------+-------------------------------------------+
+
+                    TABLE,
             ],
             'TabeCellStyle with fg,bg. Also with rowspan and colspan > 1' => [
                 [],
@@ -780,16 +772,15 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+---------------+---------------+-------------------------------------------+
-| 978           | De Monarchia  |             Dante Alighieri               |
-| 99921-58-10-7 | Divine Comedy | spans multiple rows rows Dante Alighieri  |
-|               |               |         spans multiple rows rows          |
-+---------------+---------------+-------------------------------------------+
-|             test              |                                      tttt |
-+---------------+---------------+-------------------------------------------+
-
-TABLE
-                ,
+                    +---------------+---------------+-------------------------------------------+
+                    | 978           | De Monarchia  |             Dante Alighieri               |
+                    | 99921-58-10-7 | Divine Comedy | spans multiple rows rows Dante Alighieri  |
+                    |               |               |         spans multiple rows rows          |
+                    +---------------+---------------+-------------------------------------------+
+                    |             test              |                                      tttt |
+                    +---------------+---------------+-------------------------------------------+
+
+                    TABLE,
                 true,
             ],
             'TabeCellStyle with cellFormat. Also with rowspan and colspan > 1' => [
@@ -835,16 +826,15 @@ public static function renderProvider()
                 ],
                 'default',
                 <<<'TABLE'
-+----------------+---------------+---------------------+
-| ISBN           | Title         | Author              |
-+----------------+---------------+---------------------+
-| 978-0521567817 | De Monarchia  | Dante Alighieri     |
-| 978-0804169127 | Divine Comedy | spans multiple rows |
-| test                           | tttt                |
-+----------------+---------------+---------------------+
-
-TABLE
-                ,
+                    +----------------+---------------+---------------------+
+                    | ISBN           | Title         | Author              |
+                    +----------------+---------------+---------------------+
+                    | 978-0521567817 | De Monarchia  | Dante Alighieri     |
+                    | 978-0804169127 | Divine Comedy | spans multiple rows |
+                    | test                           | tttt                |
+                    +----------------+---------------+---------------------+
+
+                    TABLE,
                 true,
             ],
         ];
@@ -862,13 +852,13 @@ public function testRenderMultiByte()
 
         $expected =
 <<<'TABLE'
-+------+
-| ■■   |
-+------+
-| 1234 |
-+------+
+    +------+
+    | ■■   |
+    +------+
+    | 1234 |
+    +------+
 
-TABLE;
+    TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -882,11 +872,11 @@ public function testTableCellWithNumericIntValue()
 
         $expected =
 <<<'TABLE'
-+-------+
-| 12345 |
-+-------+
+    +-------+
+    | 12345 |
+    +-------+
 
-TABLE;
+    TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -900,11 +890,11 @@ public function testTableCellWithNumericFloatValue()
 
         $expected =
 <<<'TABLE'
-+----------+
-| 12345.01 |
-+----------+
+    +----------+
+    | 12345.01 |
+    +----------+
 
-TABLE;
+    TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -928,13 +918,13 @@ public function testStyle()
 
         $expected =
 <<<'TABLE'
-.......
-. Foo .
-.......
-. Bar .
-.......
+    .......
+    . Foo .
+    .......
+    . Bar .
+    .......
 
-TABLE;
+    TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -955,17 +945,17 @@ public function testRowSeparator()
 
         $expected =
 <<<'TABLE'
-+------+
-| Foo  |
-+------+
-| Bar1 |
-+------+
-| Bar2 |
-+------+
-| Bar3 |
-+------+
-
-TABLE;
+    +------+
+    | Foo  |
+    +------+
+    | Bar1 |
+    +------+
+    | Bar2 |
+    +------+
+    | Bar3 |
+    +------+
+
+    TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
 
@@ -984,17 +974,17 @@ public function testRenderMultiCalls()
 
         $expected =
 <<<TABLE
-+----+---+
-| foo    |
-+----+---+
-+----+---+
-| foo    |
-+----+---+
-+----+---+
-| foo    |
-+----+---+
-
-TABLE;
+    +----+---+
+    | foo    |
+    +----+---+
+    +----+---+
+    | foo    |
+    +----+---+
+    +----+---+
+    | foo    |
+    +----+---+
+
+    TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1017,14 +1007,14 @@ public function testColumnStyle()
 
         $expected =
             <<<TABLE
-+---------------+----------------------+-----------------+--------+
-| ISBN          | Title                | Author          |  Price |
-+---------------+----------------------+-----------------+--------+
-| 99921-58-10-7 | Divine Comedy        | Dante Alighieri |   9.95 |
-| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
-+---------------+----------------------+-----------------+--------+
+                +---------------+----------------------+-----------------+--------+
+                | ISBN          | Title                | Author          |  Price |
+                +---------------+----------------------+-----------------+--------+
+                | 99921-58-10-7 | Divine Comedy        | Dante Alighieri |   9.95 |
+                | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
+                +---------------+----------------------+-----------------+--------+
 
-TABLE;
+                TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1063,14 +1053,14 @@ public function testColumnWidth()
 
         $expected =
             <<<TABLE
-+-----------------+----------------------+-----------------+------------+
-| ISBN            | Title                | Author          |      Price |
-+-----------------+----------------------+-----------------+------------+
-| 99921-58-10-7   | Divine Comedy        | Dante Alighieri |       9.95 |
-| 9971-5-0210-0   | A Tale of Two Cities | Charles Dickens |     139.25 |
-+-----------------+----------------------+-----------------+------------+
+                +-----------------+----------------------+-----------------+------------+
+                | ISBN            | Title                | Author          |      Price |
+                +-----------------+----------------------+-----------------+------------+
+                | 99921-58-10-7   | Divine Comedy        | Dante Alighieri |       9.95 |
+                | 9971-5-0210-0   | A Tale of Two Cities | Charles Dickens |     139.25 |
+                +-----------------+----------------------+-----------------+------------+
 
-TABLE;
+                TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1094,14 +1084,14 @@ public function testColumnWidths()
 
         $expected =
             <<<TABLE
-+-----------------+----------------------+-----------------+------------+
-| ISBN            | Title                | Author          |      Price |
-+-----------------+----------------------+-----------------+------------+
-| 99921-58-10-7   | Divine Comedy        | Dante Alighieri |       9.95 |
-| 9971-5-0210-0   | A Tale of Two Cities | Charles Dickens |     139.25 |
-+-----------------+----------------------+-----------------+------------+
+                +-----------------+----------------------+-----------------+------------+
+                | ISBN            | Title                | Author          |      Price |
+                +-----------------+----------------------+-----------------+------------+
+                | 99921-58-10-7   | Divine Comedy        | Dante Alighieri |       9.95 |
+                | 9971-5-0210-0   | A Tale of Two Cities | Charles Dickens |     139.25 |
+                +-----------------+----------------------+-----------------+------------+
 
-TABLE;
+                TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1124,19 +1114,19 @@ public function testSectionOutput()
 
         $expected =
             <<<TABLE
-+---------------+---------------+-----------------+-------+
-|\033[32m ISBN          \033[39m|\033[32m Title         \033[39m|\033[32m Author          \033[39m|\033[32m Price \033[39m|
-+---------------+---------------+-----------------+-------+
-| 99921-58-10-7 | Divine Comedy | Dante Alighieri | 9.95  |
-+---------------+---------------+-----------------+-------+
-\x1b[5A\x1b[0J+---------------+----------------------+-----------------+--------+
-|\033[32m ISBN          \033[39m|\033[32m Title                \033[39m|\033[32m Author          \033[39m|\033[32m Price  \033[39m|
-+---------------+----------------------+-----------------+--------+
-| 99921-58-10-7 | Divine Comedy        | Dante Alighieri | 9.95   |
-| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
-+---------------+----------------------+-----------------+--------+
-
-TABLE;
+                +---------------+---------------+-----------------+-------+
+                |\033[32m ISBN          \033[39m|\033[32m Title         \033[39m|\033[32m Author          \033[39m|\033[32m Price \033[39m|
+                +---------------+---------------+-----------------+-------+
+                | 99921-58-10-7 | Divine Comedy | Dante Alighieri | 9.95  |
+                +---------------+---------------+-----------------+-------+
+                \x1b[5A\x1b[0J+---------------+----------------------+-----------------+--------+
+                |\033[32m ISBN          \033[39m|\033[32m Title                \033[39m|\033[32m Author          \033[39m|\033[32m Price  \033[39m|
+                +---------------+----------------------+-----------------+--------+
+                | 99921-58-10-7 | Divine Comedy        | Dante Alighieri | 9.95   |
+                | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
+                +---------------+----------------------+-----------------+--------+
+
+                TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1157,14 +1147,14 @@ public function testSectionOutputDoesntClearIfTableIsntRendered()
 
         $expected =
             <<<TABLE
-+---------------+----------------------+-----------------+--------+
-|\033[32m ISBN          \033[39m|\033[32m Title                \033[39m|\033[32m Author          \033[39m|\033[32m Price  \033[39m|
-+---------------+----------------------+-----------------+--------+
-| 99921-58-10-7 | Divine Comedy        | Dante Alighieri | 9.95   |
-| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
-+---------------+----------------------+-----------------+--------+
+                +---------------+----------------------+-----------------+--------+
+                |\033[32m ISBN          \033[39m|\033[32m Title                \033[39m|\033[32m Author          \033[39m|\033[32m Price  \033[39m|
+                +---------------+----------------------+-----------------+--------+
+                | 99921-58-10-7 | Divine Comedy        | Dante Alighieri | 9.95   |
+                | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
+                +---------------+----------------------+-----------------+--------+
 
-TABLE;
+                TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1187,19 +1177,19 @@ public function testSectionOutputWithoutDecoration()
 
         $expected =
             <<<TABLE
-+---------------+---------------+-----------------+-------+
-| ISBN          | Title         | Author          | Price |
-+---------------+---------------+-----------------+-------+
-| 99921-58-10-7 | Divine Comedy | Dante Alighieri | 9.95  |
-+---------------+---------------+-----------------+-------+
-+---------------+----------------------+-----------------+--------+
-| ISBN          | Title                | Author          | Price  |
-+---------------+----------------------+-----------------+--------+
-| 99921-58-10-7 | Divine Comedy        | Dante Alighieri | 9.95   |
-| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
-+---------------+----------------------+-----------------+--------+
-
-TABLE;
+                +---------------+---------------+-----------------+-------+
+                | ISBN          | Title         | Author          | Price |
+                +---------------+---------------+-----------------+-------+
+                | 99921-58-10-7 | Divine Comedy | Dante Alighieri | 9.95  |
+                +---------------+---------------+-----------------+-------+
+                +---------------+----------------------+-----------------+--------+
+                | ISBN          | Title                | Author          | Price  |
+                +---------------+----------------------+-----------------+--------+
+                | 99921-58-10-7 | Divine Comedy        | Dante Alighieri | 9.95   |
+                | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
+                +---------------+----------------------+-----------------+--------+
+
+                TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1230,17 +1220,17 @@ public function testSectionOutputHandlesZeroRowsAfterRender()
 
         $expected =
             <<<TABLE
-My Table
-+------+-------+--------+-------+
-|\033[32m ISBN \033[39m|\033[32m Title \033[39m|\033[32m Author \033[39m|\033[32m Price \033[39m|
-+------+-------+--------+-------+
-\x1b[3A\x1b[0J+---------------+----------------------+-----------------+--------+
-|\033[32m ISBN          \033[39m|\033[32m Title                \033[39m|\033[32m Author          \033[39m|\033[32m Price  \033[39m|
-+---------------+----------------------+-----------------+--------+
-| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
-+---------------+----------------------+-----------------+--------+
-
-TABLE;
+                My Table
+                +------+-------+--------+-------+
+                |\033[32m ISBN \033[39m|\033[32m Title \033[39m|\033[32m Author \033[39m|\033[32m Price \033[39m|
+                +------+-------+--------+-------+
+                \x1b[3A\x1b[0J+---------------+----------------------+-----------------+--------+
+                |\033[32m ISBN          \033[39m|\033[32m Title                \033[39m|\033[32m Author          \033[39m|\033[32m Price  \033[39m|
+                +---------------+----------------------+-----------------+--------+
+                | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
+                +---------------+----------------------+-----------------+--------+
+
+                TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1260,9 +1250,7 @@ public function testGetStyleDefinition()
         Table::getStyleDefinition('absent');
     }
 
-    /**
-     * @dataProvider renderSetTitle
-     */
+    #[DataProvider('renderSetTitle')]
     public function testSetTitle($headerTitle, $footerTitle, $style, $expected)
     {
         (new Table($output = $this->getOutputStream()))
@@ -1290,68 +1278,66 @@ public static function renderSetTitle()
                 'Page 1/2',
                 'default',
                 <<<'TABLE'
-+---------------+----------- Books --------+------------------+
-| ISBN          | Title                    | Author           |
-+---------------+--------------------------+------------------+
-| 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
-| 9971-5-0210-0 | A Tale of Two Cities     | Charles Dickens  |
-| 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
-| 80-902734-1-6 | And Then There Were None | Agatha Christie  |
-+---------------+--------- Page 1/2 -------+------------------+
-
-TABLE
-                ,
-                true,
+                    +---------------+----------- Books --------+------------------+
+                    | ISBN          | Title                    | Author           |
+                    +---------------+--------------------------+------------------+
+                    | 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
+                    | 9971-5-0210-0 | A Tale of Two Cities     | Charles Dickens  |
+                    | 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
+                    | 80-902734-1-6 | And Then There Were None | Agatha Christie  |
+                    +---------------+--------- Page 1/2 -------+------------------+
+
+                    TABLE,
             ],
             'header contains multiple lines' => [
                 'Multiline'."\n".'header'."\n".'here',
                 'footer',
                 'default',
                 <<<'TABLE'
-+---------------+--- Multiline
-header
-here +------------------+
-| ISBN          | Title                    | Author           |
-+---------------+--------------------------+------------------+
-| 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
-| 9971-5-0210-0 | A Tale of Two Cities     | Charles Dickens  |
-| 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
-| 80-902734-1-6 | And Then There Were None | Agatha Christie  |
-+---------------+---------- footer --------+------------------+
-
-TABLE,
+                    +---------------+--- Multiline
+                    header
+                    here +------------------+
+                    | ISBN          | Title                    | Author           |
+                    +---------------+--------------------------+------------------+
+                    | 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
+                    | 9971-5-0210-0 | A Tale of Two Cities     | Charles Dickens  |
+                    | 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
+                    | 80-902734-1-6 | And Then There Were None | Agatha Christie  |
+                    +---------------+---------- footer --------+------------------+
+
+                    TABLE,
             ],
             [
                 'Books',
                 'Page 1/2',
                 'box',
                 <<<'TABLE'
-┌───────────────┬─────────── Books ────────┬──────────────────┐
-│ ISBN          │ Title                    │ Author           │
-├───────────────┼──────────────────────────┼──────────────────┤
-│ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  │
-│ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  │
-│ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien │
-│ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  │
-└───────────────┴───────── Page 1/2 ───────┴──────────────────┘
-
-TABLE,
+                    ┌───────────────┬─────────── Books ────────┬──────────────────┐
+                    │ ISBN          │ Title                    │ Author           │
+                    ├───────────────┼──────────────────────────┼──────────────────┤
+                    │ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  │
+                    │ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  │
+                    │ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien │
+                    │ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  │
+                    └───────────────┴───────── Page 1/2 ───────┴──────────────────┘
+
+                    TABLE,
             ],
             [
                 'Boooooooooooooooooooooooooooooooooooooooooooooooooooooooks',
                 'Page 1/999999999999999999999999999999999999999999999999999',
                 'default',
                 <<<'TABLE'
-+- Booooooooooooooooooooooooooooooooooooooooooooooooooooo... -+
-| ISBN          | Title                    | Author           |
-+---------------+--------------------------+------------------+
-| 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
-| 9971-5-0210-0 | A Tale of Two Cities     | Charles Dickens  |
-| 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
-| 80-902734-1-6 | And Then There Were None | Agatha Christie  |
-+- Page 1/99999999999999999999999999999999999999999999999... -+
-
-TABLE,
+                    +- Booooooooooooooooooooooooooooooooooooooooooooooooooooo... -+
+                    | ISBN          | Title                    | Author           |
+                    +---------------+--------------------------+------------------+
+                    | 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
+                    | 9971-5-0210-0 | A Tale of Two Cities     | Charles Dickens  |
+                    | 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
+                    | 80-902734-1-6 | And Then There Were None | Agatha Christie  |
+                    +- Page 1/99999999999999999999999999999999999999999999999... -+
+
+                    TABLE,
             ],
         ];
     }
@@ -1367,12 +1353,12 @@ public function testSetTitleWithoutHeaders()
             ->render();
 
         $expected = <<<'TABLE'
-+-------- Reproducer --------+
-| Value            | 123-456 |
-| Some other value | 789-0   |
-+------------------+---------+
+            +-------- Reproducer --------+
+            | Value            | 123-456 |
+            | Some other value | 789-0   |
+            +------------------+---------+
 
-TABLE;
+            TABLE;
 
         $this->assertSame($expected, $this->getOutputContent($output));
     }
@@ -1392,16 +1378,16 @@ public function testColumnMaxWidths()
 
         $expected =
             <<<TABLE
-+---------------+-------+----------+----------------+
-| Divine Comedy | A     | The Lord | And Then There |
-|               | Tale  | of the   | Were None      |
-|               | of    | Rings    |                |
-|               | Two   |          |                |
-|               | Citie |          |                |
-|               | s     |          |                |
-+---------------+-------+----------+----------------+
+                +---------------+-------+----------+----------------+
+                | Divine Comedy | A     | The Lord | And Then There |
+                |               | Tale  | of the   | Were None      |
+                |               | of    | Rings    |                |
+                |               | Two   |          |                |
+                |               | Citie |          |                |
+                |               | s     |          |                |
+                +---------------+-------+----------+----------------+
 
-TABLE;
+                TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1428,15 +1414,15 @@ public function testColumnMaxWidthsHeaders()
 
         $expected =
             <<<TABLE
-+-------------+--------------------------------+
-| Publication | Very long header with a lot of |
-|             | information                    |
-+-------------+--------------------------------+
-| 1954        | The Lord of the Rings, by      |
-|             | J.R.R. Tolkien                 |
-+-------------+--------------------------------+
+                +-------------+--------------------------------+
+                | Publication | Very long header with a lot of |
+                |             | information                    |
+                +-------------+--------------------------------+
+                | 1954        | The Lord of the Rings, by      |
+                |             | J.R.R. Tolkien                 |
+                +-------------+--------------------------------+
 
-TABLE;
+                TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1451,12 +1437,12 @@ public function testColumnMaxWidthsWithTrailingBackslash()
 
         $expected =
             <<<'TABLE'
-+-------+
-| 1234\ |
-| 6     |
-+-------+
+                +-------+
+                | 1234\ |
+                | 6     |
+                +-------+
 
-TABLE;
+                TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
@@ -1484,15 +1470,15 @@ public function testBoxedStyleWithColspan()
 
         $expected =
             <<<TABLE
-┌───────────────┬───────────────┬─────────────────┐
-│ ISBN          │ Title         │ Author          │
-├───────────────┼───────────────┼─────────────────┤
-│ 99921-58-10-7 │ Divine Comedy │ Dante Alighieri │
-├───────────────┼───────────────┼─────────────────┤
-│ This value spans 3 columns.                     │
-└───────────────┴───────────────┴─────────────────┘
+                ┌───────────────┬───────────────┬─────────────────┐
+                │ ISBN          │ Title         │ Author          │
+                ├───────────────┼───────────────┼─────────────────┤
+                │ 99921-58-10-7 │ Divine Comedy │ Dante Alighieri │
+                ├───────────────┼───────────────┼─────────────────┤
+                │ This value spans 3 columns.                     │
+                └───────────────┴───────────────┴─────────────────┘
 
-TABLE;
+                TABLE;
 
         $this->assertSame($expected, $this->getOutputContent($output));
     }
@@ -1502,43 +1488,41 @@ public static function provideRenderHorizontalTests()
         $headers = ['foo', 'bar', 'baz'];
         $rows = [['one', 'two', 'tree'], ['1', '2', '3']];
         $expected = <<<EOTXT
-+-----+------+---+
-| foo | one  | 1 |
-| bar | two  | 2 |
-| baz | tree | 3 |
-+-----+------+---+
+            +-----+------+---+
+            | foo | one  | 1 |
+            | bar | two  | 2 |
+            | baz | tree | 3 |
+            +-----+------+---+
 
-EOTXT;
+            EOTXT;
         yield [$headers, $rows, $expected];
 
         $headers = ['foo', 'bar', 'baz'];
         $rows = [['one', 'two'], ['1']];
         $expected = <<<EOTXT
-+-----+-----+---+
-| foo | one | 1 |
-| bar | two |   |
-| baz |     |   |
-+-----+-----+---+
+            +-----+-----+---+
+            | foo | one | 1 |
+            | bar | two |   |
+            | baz |     |   |
+            +-----+-----+---+
 
-EOTXT;
+            EOTXT;
         yield [$headers, $rows, $expected];
 
         $headers = ['foo', 'bar', 'baz'];
         $rows = [['one', 'two', 'tree'], new TableSeparator(), ['1', '2', '3']];
         $expected = <<<EOTXT
-+-----+------+---+
-| foo | one  | 1 |
-| bar | two  | 2 |
-| baz | tree | 3 |
-+-----+------+---+
+            +-----+------+---+
+            | foo | one  | 1 |
+            | bar | two  | 2 |
+            | baz | tree | 3 |
+            +-----+------+---+
 
-EOTXT;
+            EOTXT;
         yield [$headers, $rows, $expected];
     }
 
-    /**
-     * @dataProvider provideRenderHorizontalTests
-     */
+    #[DataProvider('provideRenderHorizontalTests')]
     public function testRenderHorizontal(array $headers, array $rows, string $expected)
     {
         $table = new Table($output = $this->getOutputStream());
@@ -1589,29 +1573,29 @@ public function testWithColspanAndMaxWith()
 
         $expected =
             <<<TABLE
-+-----------------+-----------------+-----------------+
-| Lorem ipsum dolor sit amet, consectetur adipiscing  |
-| elit, sed do eiusmod tempor                         |
-+-----------------+-----------------+-----------------+
-| Lorem ipsum dolor sit amet, consectetur adipiscing  |
-| elit, sed do eiusmod tempor                         |
-+-----------------+-----------------+-----------------+
-| Lorem ipsum dolor sit amet, conse | hello world     |
-| ctetur                            |                 |
-+-----------------+-----------------+-----------------+
-| hello world     | Lorem ipsum dolor sit amet, conse |
-|                 | ctetur adipiscing elit            |
-+-----------------+-----------------+-----------------+
-| hello           | world           | Lorem ipsum     |
-|                 |                 | dolor sit amet, |
-|                 |                 | consectetur     |
-+-----------------+-----------------+-----------------+
-| Symfony         | Test            | Lorem ipsum dol |
-|                 |                 | or sit amet,    |
-|                 |                 | consectetur     |
-+-----------------+-----------------+-----------------+
-
-TABLE;
+                +-----------------+-----------------+-----------------+
+                | Lorem ipsum dolor sit amet, consectetur adipiscing  |
+                | elit, sed do eiusmod tempor                         |
+                +-----------------+-----------------+-----------------+
+                | Lorem ipsum dolor sit amet, consectetur adipiscing  |
+                | elit, sed do eiusmod tempor                         |
+                +-----------------+-----------------+-----------------+
+                | Lorem ipsum dolor sit amet, conse | hello world     |
+                | ctetur                            |                 |
+                +-----------------+-----------------+-----------------+
+                | hello world     | Lorem ipsum dolor sit amet, conse |
+                |                 | ctetur adipiscing elit            |
+                +-----------------+-----------------+-----------------+
+                | hello           | world           | Lorem ipsum     |
+                |                 |                 | dolor sit amet, |
+                |                 |                 | consectetur     |
+                +-----------------+-----------------+-----------------+
+                | Symfony         | Test            | Lorem ipsum dol |
+                |                 |                 | or sit amet,    |
+                |                 |                 | consectetur     |
+                +-----------------+-----------------+-----------------+
+
+                TABLE;
 
         $this->assertSame($expected, $this->getOutputContent($output));
     }
@@ -1625,55 +1609,52 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'With header for all' => [
             <<<EOTXT
-+------------------------------+
-|   ISBN: 99921-58-10-7        |
-|  Title: Divine Comedy        |
-| Author: Dante Alighieri      |
-|  Price: 9.95                 |
-|------------------------------|
-|   ISBN: 9971-5-0210-0        |
-|  Title: A Tale of Two Cities |
-| Author: Charles Dickens      |
-|  Price: 139.25               |
-+------------------------------+
-
-EOTXT
-            ,
+                +------------------------------+
+                |   ISBN: 99921-58-10-7        |
+                |  Title: Divine Comedy        |
+                | Author: Dante Alighieri      |
+                |  Price: 9.95                 |
+                |------------------------------|
+                |   ISBN: 9971-5-0210-0        |
+                |  Title: A Tale of Two Cities |
+                | Author: Charles Dickens      |
+                |  Price: 139.25               |
+                +------------------------------+
+
+                EOTXT,
             ['ISBN', 'Title', 'Author', 'Price'],
             $books,
         ];
 
         yield 'With header for none' => [
             <<<EOTXT
-+----------------------+
-| 99921-58-10-7        |
-| Divine Comedy        |
-| Dante Alighieri      |
-| 9.95                 |
-|----------------------|
-| 9971-5-0210-0        |
-| A Tale of Two Cities |
-| Charles Dickens      |
-| 139.25               |
-+----------------------+
-
-EOTXT
-            ,
+                +----------------------+
+                | 99921-58-10-7        |
+                | Divine Comedy        |
+                | Dante Alighieri      |
+                | 9.95                 |
+                |----------------------|
+                | 9971-5-0210-0        |
+                | A Tale of Two Cities |
+                | Charles Dickens      |
+                | 139.25               |
+                +----------------------+
+
+                EOTXT,
             [],
             $books,
         ];
 
         yield 'With multibyte characters in some headers (the "í" in "Títle") and cells (the "í" in "Dívíne")' => [
             <<<EOTXT
-+-------------------------+
-|   ISBN: 99921-58-10-7   |
-|  Títle: Dívíne Comedy   |
-| Author: Dante Alighieri |
-|  Price: 9.95            |
-+-------------------------+
-
-EOTXT
-            ,
+                +-------------------------+
+                |   ISBN: 99921-58-10-7   |
+                |  Títle: Dívíne Comedy   |
+                | Author: Dante Alighieri |
+                |  Price: 9.95            |
+                +-------------------------+
+
+                EOTXT,
             ['ISBN', 'Títle', 'Author', 'Price'],
             [
                 [
@@ -1687,38 +1668,36 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'With header for some' => [
             <<<EOTXT
-+------------------------------+
-|   ISBN: 99921-58-10-7        |
-|  Title: Divine Comedy        |
-| Author: Dante Alighieri      |
-|       : 9.95                 |
-|------------------------------|
-|   ISBN: 9971-5-0210-0        |
-|  Title: A Tale of Two Cities |
-| Author: Charles Dickens      |
-|       : 139.25               |
-+------------------------------+
-
-EOTXT
-            ,
+                +------------------------------+
+                |   ISBN: 99921-58-10-7        |
+                |  Title: Divine Comedy        |
+                | Author: Dante Alighieri      |
+                |       : 9.95                 |
+                |------------------------------|
+                |   ISBN: 9971-5-0210-0        |
+                |  Title: A Tale of Two Cities |
+                | Author: Charles Dickens      |
+                |       : 139.25               |
+                +------------------------------+
+
+                EOTXT,
             ['ISBN', 'Title', 'Author'],
             $books,
         ];
 
         yield 'With row for some headers' => [
             <<<EOTXT
-+----------+
-| foo: one |
-| bar: two |
-| baz:     |
-|----------|
-| foo: 1   |
-| bar:     |
-| baz:     |
-+----------+
-
-EOTXT
-            ,
+                +----------+
+                | foo: one |
+                | bar: two |
+                | baz:     |
+                |----------|
+                | foo: 1   |
+                | bar:     |
+                | baz:     |
+                +----------+
+
+                EOTXT,
             ['foo', 'bar', 'baz'],
             [
                 ['one', 'two'],
@@ -1728,18 +1707,17 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'With TableSeparator' => [
             <<<EOTXT
-+-----------+
-| foo: one  |
-| bar: two  |
-| baz: tree |
-|-----------|
-| foo: 1    |
-| bar: 2    |
-| baz: 3    |
-+-----------+
-
-EOTXT
-            ,
+                +-----------+
+                | foo: one  |
+                | bar: two  |
+                | baz: tree |
+                |-----------|
+                | foo: 1    |
+                | bar: 2    |
+                | baz: 3    |
+                +-----------+
+
+                EOTXT,
             ['foo', 'bar', 'baz'],
             [
                 ['one', 'two', 'tree'],
@@ -1750,21 +1728,20 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'With breaking line' => [
             <<<EOTXT
-+-------------------------+
-|   ISBN: 99921-58-10-7   |
-|  Title: Divine Comedy   |
-| Author: Dante Alighieri |
-|  Price: 9.95            |
-|-------------------------|
-|   ISBN: 9971-5-0210-0   |
-|  Title: A Tale          |
-|         of Two Cities   |
-| Author: Charles Dickens |
-|  Price: 139.25          |
-+-------------------------+
-
-EOTXT
-            ,
+                +-------------------------+
+                |   ISBN: 99921-58-10-7   |
+                |  Title: Divine Comedy   |
+                | Author: Dante Alighieri |
+                |  Price: 9.95            |
+                |-------------------------|
+                |   ISBN: 9971-5-0210-0   |
+                |  Title: A Tale          |
+                |         of Two Cities   |
+                | Author: Charles Dickens |
+                |  Price: 139.25          |
+                +-------------------------+
+
+                EOTXT,
             ['ISBN', 'Title', 'Author', 'Price'],
             [
                 ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'],
@@ -1774,18 +1751,17 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'With text tag' => [
             <<<EOTXT
-+------------------------------+
-|   ISBN: 99921-58-10-7        |
-|  Title: Divine Comedy        |
-| Author: Dante Alighieri      |
-|------------------------------|
-|   ISBN: 9971-5-0210-0        |
-|  Title: A Tale of Two Cities |
-| Author: Charles Dickens      |
-+------------------------------+
-
-EOTXT
-            ,
+                +------------------------------+
+                |   ISBN: 99921-58-10-7        |
+                |  Title: Divine Comedy        |
+                | Author: Dante Alighieri      |
+                |------------------------------|
+                |   ISBN: 9971-5-0210-0        |
+                |  Title: A Tale of Two Cities |
+                | Author: Charles Dickens      |
+                +------------------------------+
+
+                EOTXT,
             ['ISBN', 'Title', 'Author'],
             [
                 ['<info>99921-58-10-7</info>', '<error>Divine Comedy</error>', '<fg=blue;bg=white>Dante Alighieri</fg=blue;bg=white>'],
@@ -1795,20 +1771,19 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'With colspan' => [
             <<<EOTXT
-+---------------------------------------------------------------------------------------+
-|   ISBN: 99921-58-10-7                                                                 |
-|  Title: Divine Comedy                                                                 |
-| Author: Dante Alighieri                                                               |
-|---------------------------------------------------------------------------------------|
-| Cupiditate dicta atque porro, tempora exercitationem modi animi nulla nemo vel nihil! |
-|---------------------------------------------------------------------------------------|
-|   ISBN: 9971-5-0210-0                                                                 |
-|  Title: A Tale of Two Cities                                                          |
-| Author: Charles Dickens                                                               |
-+---------------------------------------------------------------------------------------+
-
-EOTXT
-            ,
+                +---------------------------------------------------------------------------------------+
+                |   ISBN: 99921-58-10-7                                                                 |
+                |  Title: Divine Comedy                                                                 |
+                | Author: Dante Alighieri                                                               |
+                |---------------------------------------------------------------------------------------|
+                | Cupiditate dicta atque porro, tempora exercitationem modi animi nulla nemo vel nihil! |
+                |---------------------------------------------------------------------------------------|
+                |   ISBN: 9971-5-0210-0                                                                 |
+                |  Title: A Tale of Two Cities                                                          |
+                | Author: Charles Dickens                                                               |
+                +---------------------------------------------------------------------------------------+
+
+                EOTXT,
             ['ISBN', 'Title', 'Author'],
             [
                 ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'],
@@ -1819,28 +1794,27 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'With colspans but no header' => [
             <<<EOTXT
-+--------------------------------------------------------------------------------+
-| Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor |
-|--------------------------------------------------------------------------------|
-| Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor |
-|--------------------------------------------------------------------------------|
-| Lorem ipsum dolor sit amet, consectetur                                        |
-| hello world                                                                    |
-|--------------------------------------------------------------------------------|
-| hello world                                                                    |
-| Lorem ipsum dolor sit amet, consectetur adipiscing elit                        |
-|--------------------------------------------------------------------------------|
-| hello                                                                          |
-| world                                                                          |
-| Lorem ipsum dolor sit amet, consectetur                                        |
-|--------------------------------------------------------------------------------|
-| Symfony                                                                        |
-| Test                                                                           |
-| Lorem ipsum dolor sit amet, consectetur                                        |
-+--------------------------------------------------------------------------------+
-
-EOTXT
-            ,
+                +--------------------------------------------------------------------------------+
+                | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor |
+                |--------------------------------------------------------------------------------|
+                | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor |
+                |--------------------------------------------------------------------------------|
+                | Lorem ipsum dolor sit amet, consectetur                                        |
+                | hello world                                                                    |
+                |--------------------------------------------------------------------------------|
+                | hello world                                                                    |
+                | Lorem ipsum dolor sit amet, consectetur adipiscing elit                        |
+                |--------------------------------------------------------------------------------|
+                | hello                                                                          |
+                | world                                                                          |
+                | Lorem ipsum dolor sit amet, consectetur                                        |
+                |--------------------------------------------------------------------------------|
+                | Symfony                                                                        |
+                | Test                                                                           |
+                | Lorem ipsum dolor sit amet, consectetur                                        |
+                +--------------------------------------------------------------------------------+
+
+                EOTXT,
             [],
             [
                 [new TableCell('Lorem ipsum dolor sit amet, <fg=white;bg=green>consectetur</> adipiscing elit, <fg=white;bg=red>sed</> do <fg=white;bg=red>eiusmod</> tempor', ['colspan' => 3])],
@@ -1859,20 +1833,19 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'Borderless style' => [
             <<<EOTXT
- ============================== 
-    ISBN: 99921-58-10-7         
-   Title: Divine Comedy         
-  Author: Dante Alighieri       
-   Price: 9.95                  
- ============================== 
-    ISBN: 9971-5-0210-0         
-   Title: A Tale of Two Cities  
-  Author: Charles Dickens       
-   Price: 139.25                
- ============================== 
-
-EOTXT
-            ,
+                 ============================== 
+                    ISBN: 99921-58-10-7         
+                   Title: Divine Comedy         
+                  Author: Dante Alighieri       
+                   Price: 9.95                  
+                 ============================== 
+                    ISBN: 9971-5-0210-0         
+                   Title: A Tale of Two Cities  
+                  Author: Charles Dickens       
+                   Price: 139.25                
+                 ============================== 
+
+                EOTXT,
             ['ISBN', 'Title', 'Author', 'Price'],
             $books,
             'borderless',
@@ -1880,18 +1853,17 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'Compact style' => [
             <<<EOTXT
-  ISBN: 99921-58-10-7        
- Title: Divine Comedy        
-Author: Dante Alighieri      
- Price: 9.95                 
-
-  ISBN: 9971-5-0210-0        
- Title: A Tale of Two Cities 
-Author: Charles Dickens      
- Price: 139.25               
-
-EOTXT
-            ,
+                  ISBN: 99921-58-10-7        
+                 Title: Divine Comedy        
+                Author: Dante Alighieri      
+                 Price: 9.95                 
+
+                  ISBN: 9971-5-0210-0        
+                 Title: A Tale of Two Cities 
+                Author: Charles Dickens      
+                 Price: 139.25               
+
+                EOTXT,
             ['ISBN', 'Title', 'Author', 'Price'],
             $books,
             'compact',
@@ -1899,20 +1871,19 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'symfony-style-guide style' => [
             <<<EOTXT
- ------------------------------ 
-    ISBN: 99921-58-10-7         
-   Title: Divine Comedy         
-  Author: Dante Alighieri       
-   Price: 9.95                  
- ------------------------------ 
-    ISBN: 9971-5-0210-0         
-   Title: A Tale of Two Cities  
-  Author: Charles Dickens       
-   Price: 139.25                
- ------------------------------ 
-
-EOTXT
-            ,
+                 ------------------------------ 
+                    ISBN: 99921-58-10-7         
+                   Title: Divine Comedy         
+                  Author: Dante Alighieri       
+                   Price: 9.95                  
+                 ------------------------------ 
+                    ISBN: 9971-5-0210-0         
+                   Title: A Tale of Two Cities  
+                  Author: Charles Dickens       
+                   Price: 139.25                
+                 ------------------------------ 
+
+                EOTXT,
             ['ISBN', 'Title', 'Author', 'Price'],
             $books,
             'symfony-style-guide',
@@ -1920,20 +1891,19 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'box style' => [
             <<<EOTXT
-┌──────────────────────────────┐
-│   ISBN: 99921-58-10-7        │
-│  Title: Divine Comedy        │
-│ Author: Dante Alighieri      │
-│  Price: 9.95                 │
-│──────────────────────────────│
-│   ISBN: 9971-5-0210-0        │
-│  Title: A Tale of Two Cities │
-│ Author: Charles Dickens      │
-│  Price: 139.25               │
-└──────────────────────────────┘
-
-EOTXT
-            ,
+                ┌──────────────────────────────┐
+                │   ISBN: 99921-58-10-7        │
+                │  Title: Divine Comedy        │
+                │ Author: Dante Alighieri      │
+                │  Price: 9.95                 │
+                │──────────────────────────────│
+                │   ISBN: 9971-5-0210-0        │
+                │  Title: A Tale of Two Cities │
+                │ Author: Charles Dickens      │
+                │  Price: 139.25               │
+                └──────────────────────────────┘
+
+                EOTXT,
             ['ISBN', 'Title', 'Author', 'Price'],
             $books,
             'box',
@@ -1941,20 +1911,19 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'box-double style' => [
             <<<EOTXT
-╔══════════════════════════════╗
-║   ISBN: 99921-58-10-7        ║
-║  Title: Divine Comedy        ║
-║ Author: Dante Alighieri      ║
-║  Price: 9.95                 ║
-║──────────────────────────────║
-║   ISBN: 9971-5-0210-0        ║
-║  Title: A Tale of Two Cities ║
-║ Author: Charles Dickens      ║
-║  Price: 139.25               ║
-╚══════════════════════════════╝
-
-EOTXT
-            ,
+                ╔══════════════════════════════╗
+                ║   ISBN: 99921-58-10-7        ║
+                ║  Title: Divine Comedy        ║
+                ║ Author: Dante Alighieri      ║
+                ║  Price: 9.95                 ║
+                ║──────────────────────────────║
+                ║   ISBN: 9971-5-0210-0        ║
+                ║  Title: A Tale of Two Cities ║
+                ║ Author: Charles Dickens      ║
+                ║  Price: 139.25               ║
+                ╚══════════════════════════════╝
+
+                EOTXT,
             ['ISBN', 'Title', 'Author', 'Price'],
             $books,
             'box-double',
@@ -1962,20 +1931,19 @@ public static function provideRenderVerticalTests(): \Traversable
 
         yield 'With titles' => [
             <<<EOTXT
-+----------- Books ------------+
-|   ISBN: 99921-58-10-7        |
-|  Title: Divine Comedy        |
-| Author: Dante Alighieri      |
-|  Price: 9.95                 |
-|------------------------------|
-|   ISBN: 9971-5-0210-0        |
-|  Title: A Tale of Two Cities |
-| Author: Charles Dickens      |
-|  Price: 139.25               |
-+---------- Page 1/2 ----------+
-
-EOTXT
-            ,
+                +----------- Books ------------+
+                |   ISBN: 99921-58-10-7        |
+                |  Title: Divine Comedy        |
+                | Author: Dante Alighieri      |
+                |  Price: 9.95                 |
+                |------------------------------|
+                |   ISBN: 9971-5-0210-0        |
+                |  Title: A Tale of Two Cities |
+                | Author: Charles Dickens      |
+                |  Price: 139.25               |
+                +---------- Page 1/2 ----------+
+
+                EOTXT,
             ['ISBN', 'Title', 'Author', 'Price'],
             $books,
             'default',
@@ -1984,9 +1952,7 @@ public static function provideRenderVerticalTests(): \Traversable
         ];
     }
 
-    /**
-     * @dataProvider provideRenderVerticalTests
-     */
+    #[DataProvider('provideRenderVerticalTests')]
     public function testVerticalRender(string $expectedOutput, array $headers, array $rows, string $style = 'default', string $headerTitle = '', string $footerTitle = '')
     {
         $table = new Table($output = $this->getOutputStream());
@@ -2021,15 +1987,15 @@ public function testWithHyperlinkAndMaxWidth()
 
         $expected =
             <<<TABLE
-+----------------------+
-| \033]8;;Lorem\033\\Lorem ipsum dolor\033]8;;\033\\    |
-| \033]8;;Lorem\033\\sit amet,\033]8;;\033\\            |
-| \033]8;;Lorem\033\\consectetur\033]8;;\033\\          |
-| \033]8;;Lorem\033\\adipiscing elit, sed\033]8;;\033\\ |
-| \033]8;;Lorem\033\\do eiusmod tempor\033]8;;\033\\    |
-+----------------------+
+                +----------------------+
+                | \033]8;;Lorem\033\\Lorem ipsum dolor\033]8;;\033\\    |
+                | \033]8;;Lorem\033\\sit amet,\033]8;;\033\\            |
+                | \033]8;;Lorem\033\\consectetur\033]8;;\033\\          |
+                | \033]8;;Lorem\033\\adipiscing elit, sed\033]8;;\033\\ |
+                | \033]8;;Lorem\033\\do eiusmod tempor\033]8;;\033\\    |
+                +----------------------+
 
-TABLE;
+                TABLE;
 
         $this->assertSame($expected, $this->getOutputContent($output));
     }
@@ -2052,13 +2018,12 @@ public function testGithubIssue52101HorizontalTrue()
         $table->render();
 
         $this->assertSame(<<<TABLE
-┌──── Title ┬───┐
-│ Hello │ 1 │ 3 │
-│ World │ 2 │ 4 │
-└───────┴───┴───┘
+            ┌──── Title ┬───┐
+            │ Hello │ 1 │ 3 │
+            │ World │ 2 │ 4 │
+            └───────┴───┴───┘
 
-TABLE
-            ,
+            TABLE,
             $this->getOutputContent($output)
         );
     }
@@ -2081,14 +2046,14 @@ public function testGithubIssue52101HorizontalFalse()
         $table->render();
 
         $this->assertSame(<<<TABLE
-┌──── Title ────┐
-│ Hello │ World │
-├───────┼───────┤
-│ 1     │ 2     │
-│ 3     │ 4     │
-└───────┴───────┘
-
-TABLE,
+            ┌──── Title ────┐
+            │ Hello │ World │
+            ├───────┼───────┤
+            │ 1     │ 2     │
+            │ 3     │ 4     │
+            └───────┴───────┘
+
+            TABLE,
             $this->getOutputContent($output)
         );
     }
@@ -2110,17 +2075,16 @@ public function testGithubIssue60038WidthOfCellWithEmoji()
         $table->render();
 
         $this->assertSame(<<<TABLE
-+---------------------------------- Test Title -------------+--------------------+
-| Title                                                     | Author             |
-+-----------------------------------------------------------+--------------------+
-| 🎭 💫 ☯ Divine Comedy                                     | Dante Alighieri    |
-| 👑 ❄️  🗡 Game of Thrones                                   | George R.R. Martin |
-| ❄︎❄︎❄︎ snowflake in text style ❄︎❄︎❄︎                           |                    |
-| And a very long line to show difference in previous lines |                    |
-+-----------------------------------------------------------+--------------------+
-
-TABLE
-            ,
+            +---------------------------------- Test Title -------------+--------------------+
+            | Title                                                     | Author             |
+            +-----------------------------------------------------------+--------------------+
+            | 🎭 💫 ☯ Divine Comedy                                     | Dante Alighieri    |
+            | 👑 ❄️  🗡 Game of Thrones                                   | George R.R. Martin |
+            | ❄︎❄︎❄︎ snowflake in text style ❄︎❄︎❄︎                           |                    |
+            | And a very long line to show difference in previous lines |                    |
+            +-----------------------------------------------------------+--------------------+
+
+            TABLE,
             $this->getOutputContent($output)
         );
     }
diff --git a/Tests/Helper/TreeHelperTest.php b/Tests/Helper/TreeHelperTest.php
index 5d1399b27..cd3bbd691 100644
--- a/Tests/Helper/TreeHelperTest.php
+++ b/Tests/Helper/TreeHelperTest.php
@@ -52,10 +52,12 @@ public function testRenderTwoLevelTree()
 
         $tree->render();
         $this->assertSame(<<<TREE
-Root
-├── Child 1
-└── Child 2
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            Root
+            ├── Child 1
+            └── Child 2
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRenderThreeLevelTree()
@@ -74,11 +76,13 @@ public function testRenderThreeLevelTree()
 
         $tree->render();
         $this->assertSame(<<<TREE
-Root
-├── Child 1
-│   └── SubChild 1
-└── Child 2
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            Root
+            ├── Child 1
+            │   └── SubChild 1
+            └── Child 2
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRenderMultiLevelTree()
@@ -101,13 +105,15 @@ public function testRenderMultiLevelTree()
 
         $tree->render();
         $this->assertSame(<<<TREE
-Root
-├── Child 1
-│   ├── SubChild 1
-│   │   └── SubSubChild 1
-│   └── SubChild 2
-└── Child 2
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            Root
+            ├── Child 1
+            │   ├── SubChild 1
+            │   │   └── SubSubChild 1
+            │   └── SubChild 2
+            └── Child 2
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRenderSingleNodeTree()
@@ -118,8 +124,10 @@ public function testRenderSingleNodeTree()
 
         $tree->render();
         $this->assertSame(<<<TREE
-Root
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            Root
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRenderEmptyTree()
@@ -130,8 +138,10 @@ public function testRenderEmptyTree()
 
         $tree->render();
         $this->assertSame(<<<TREE
-Root
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            Root
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRenderDeeplyNestedTree()
@@ -158,18 +168,20 @@ public function testRenderDeeplyNestedTree()
 
         $tree->render();
         $this->assertSame(<<<TREE
-Root
-└── Level 1
-  └── Level 2
-    └── Level 3
-      └── Level 4
-        └── Level 5
-          └── Level 6
-            └── Level 7
-              └── Level 8
-                └── Level 9
-                  └── Level 10
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            Root
+            └── Level 1
+              └── Level 2
+                └── Level 3
+                  └── Level 4
+                    └── Level 5
+                      └── Level 6
+                        └── Level 7
+                          └── Level 8
+                            └── Level 9
+                              └── Level 10
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRenderNodeWithMultipleChildren()
@@ -188,11 +200,13 @@ public function testRenderNodeWithMultipleChildren()
 
         $tree->render();
         $this->assertSame(<<<TREE
-Root
-├── Child 1
-├── Child 2
-└── Child 3
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            Root
+            ├── Child 1
+            ├── Child 2
+            └── Child 3
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRenderNodeWithMultipleChildrenWithStringConversion()
@@ -208,11 +222,13 @@ public function testRenderNodeWithMultipleChildrenWithStringConversion()
 
         $tree->render();
         $this->assertSame(<<<TREE
-Root
-├── Child 1
-├── Child 2
-└── Child 3
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            Root
+            ├── Child 1
+            ├── Child 2
+            └── Child 3
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRenderTreeWithDuplicateNodeNames()
@@ -231,11 +247,13 @@ public function testRenderTreeWithDuplicateNodeNames()
 
         $tree->render();
         $this->assertSame(<<<TREE
-Root
-├── Child
-│   └── Child
-└── Child
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            Root
+            ├── Child
+            │   └── Child
+            └── Child
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRenderTreeWithComplexNodeNames()
@@ -254,11 +272,13 @@ public function testRenderTreeWithComplexNodeNames()
 
         $tree->render();
         $this->assertSame(<<<TREE
-Root
-├── Child 1 (special)
-│   └── Node with spaces
-└── Child_2@#$
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            Root
+            ├── Child 1 (special)
+            │   └── Node with spaces
+            └── Child_2@#$
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRenderTreeWithCycle()
@@ -307,10 +327,12 @@ public function testCreateWithRoot()
 
         $tree->render();
         $this->assertSame(<<<TREE
-root
-├── child1
-└── child2
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            ├── child1
+            └── child2
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testCreateWithNestedArray()
@@ -322,14 +344,16 @@ public function testCreateWithNestedArray()
 
         $tree->render();
         $this->assertSame(<<<TREE
-root
-├── child1
-├── child2
-│   ├── child2.1
-│   └── child2.2
-│      └── child2.2.1
-└── child3
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            ├── child1
+            ├── child2
+            │   ├── child2.1
+            │   └── child2.2
+            │      └── child2.2.1
+            └── child3
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testCreateWithoutRoot()
@@ -341,9 +365,11 @@ public function testCreateWithoutRoot()
 
         $tree->render();
         $this->assertSame(<<<TREE
-├── child1
-└── child2
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            ├── child1
+            └── child2
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testCreateWithEmptyArray()
diff --git a/Tests/Helper/TreeStyleTest.php b/Tests/Helper/TreeStyleTest.php
index 7f5bfedd3..eadb45ded 100644
--- a/Tests/Helper/TreeStyleTest.php
+++ b/Tests/Helper/TreeStyleTest.php
@@ -28,20 +28,22 @@ public function testDefaultStyle()
         $tree->render();
 
         $this->assertSame(<<<TREE
-root
-├── A
-│   ├── A1
-│   └── A2
-│      └── A2.1
-│         ├── A2.1.1
-│         └── A2.1.2
-├── B
-│   ├── B1
-│   │   ├── B11
-│   │   └── B12
-│   └── B2
-└── C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            ├── A
+            │   ├── A1
+            │   └── A2
+            │      └── A2.1
+            │         ├── A2.1.1
+            │         └── A2.1.2
+            ├── B
+            │   ├── B1
+            │   │   ├── B11
+            │   │   └── B12
+            │   └── B2
+            └── C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testBoxStyle()
@@ -50,20 +52,22 @@ public function testBoxStyle()
         $this->createTree($output, TreeStyle::box())->render();
 
         $this->assertSame(<<<TREE
-root
-┃╸ A
-┃  ┃╸ A1
-┃  ┗╸ A2
-┃     ┗╸ A2.1
-┃        ┃╸ A2.1.1
-┃        ┗╸ A2.1.2
-┃╸ B
-┃  ┃╸ B1
-┃  ┃  ┃╸ B11
-┃  ┃  ┗╸ B12
-┃  ┗╸ B2
-┗╸ C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            ┃╸ A
+            ┃  ┃╸ A1
+            ┃  ┗╸ A2
+            ┃     ┗╸ A2.1
+            ┃        ┃╸ A2.1.1
+            ┃        ┗╸ A2.1.2
+            ┃╸ B
+            ┃  ┃╸ B1
+            ┃  ┃  ┃╸ B11
+            ┃  ┃  ┗╸ B12
+            ┃  ┗╸ B2
+            ┗╸ C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testBoxDoubleStyle()
@@ -72,20 +76,22 @@ public function testBoxDoubleStyle()
         $this->createTree($output, TreeStyle::boxDouble())->render();
 
         $this->assertSame(<<<TREE
-root
-╠═ A
-║  ╠═ A1
-║  ╚═ A2
-║    ╚═ A2.1
-║      ╠═ A2.1.1
-║      ╚═ A2.1.2
-╠═ B
-║  ╠═ B1
-║  ║  ╠═ B11
-║  ║  ╚═ B12
-║  ╚═ B2
-╚═ C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            ╠═ A
+            ║  ╠═ A1
+            ║  ╚═ A2
+            ║    ╚═ A2.1
+            ║      ╠═ A2.1.1
+            ║      ╚═ A2.1.2
+            ╠═ B
+            ║  ╠═ B1
+            ║  ║  ╠═ B11
+            ║  ║  ╚═ B12
+            ║  ╚═ B2
+            ╚═ C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testCompactStyle()
@@ -94,20 +100,22 @@ public function testCompactStyle()
         $this->createTree($output, TreeStyle::compact())->render();
 
         $this->assertSame(<<<'TREE'
-root
-├ A
-│ ├ A1
-│ └ A2
-│   └ A2.1
-│     ├ A2.1.1
-│     └ A2.1.2
-├ B
-│ ├ B1
-│ │ ├ B11
-│ │ └ B12
-│ └ B2
-└ C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            ├ A
+            │ ├ A1
+            │ └ A2
+            │   └ A2.1
+            │     ├ A2.1.1
+            │     └ A2.1.2
+            ├ B
+            │ ├ B1
+            │ │ ├ B11
+            │ │ └ B12
+            │ └ B2
+            └ C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testLightStyle()
@@ -116,20 +124,22 @@ public function testLightStyle()
         $this->createTree($output, TreeStyle::light())->render();
 
         $this->assertSame(<<<'TREE'
-root
-|-- A
-|   |-- A1
-|   `-- A2
-|       `-- A2.1
-|           |-- A2.1.1
-|           `-- A2.1.2
-|-- B
-|   |-- B1
-|   |   |-- B11
-|   |   `-- B12
-|   `-- B2
-`-- C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            |-- A
+            |   |-- A1
+            |   `-- A2
+            |       `-- A2.1
+            |           |-- A2.1.1
+            |           `-- A2.1.2
+            |-- B
+            |   |-- B1
+            |   |   |-- B11
+            |   |   `-- B12
+            |   `-- B2
+            `-- C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testMinimalStyle()
@@ -138,20 +148,22 @@ public function testMinimalStyle()
         $this->createTree($output, TreeStyle::minimal())->render();
 
         $this->assertSame(<<<'TREE'
-root
-. A
-. . A1
-. . A2
-.   . A2.1
-.     . A2.1.1
-.     . A2.1.2
-. B
-. . B1
-. . . B11
-. . . B12
-. . B2
-. C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            . A
+            . . A1
+            . . A2
+            .   . A2.1
+            .     . A2.1.1
+            .     . A2.1.2
+            . B
+            . . B1
+            . . . B11
+            . . . B12
+            . . B2
+            . C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testRoundedStyle()
@@ -160,20 +172,22 @@ public function testRoundedStyle()
         $this->createTree($output, TreeStyle::rounded())->render();
 
         $this->assertSame(<<<'TREE'
-root
-├─ A
-│  ├─ A1
-│  ╰─ A2
-│     ╰─ A2.1
-│        ├─ A2.1.1
-│        ╰─ A2.1.2
-├─ B
-│  ├─ B1
-│  │  ├─ B11
-│  │  ╰─ B12
-│  ╰─ B2
-╰─ C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            ├─ A
+            │  ├─ A1
+            │  ╰─ A2
+            │     ╰─ A2.1
+            │        ├─ A2.1.1
+            │        ╰─ A2.1.2
+            ├─ B
+            │  ├─ B1
+            │  │  ├─ B11
+            │  │  ╰─ B12
+            │  ╰─ B2
+            ╰─ C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testCustomPrefix()
@@ -183,20 +197,22 @@ public function testCustomPrefix()
         self::createTree($output, $style)->render();
 
         $this->assertSame(<<<'TREE'
-root
-C A F A
-C D A F A1
-C D B F A2
-C D E B F A2.1
-C D E E A F A2.1.1
-C D E E B F A2.1.2
-C A F B
-C D A F B1
-C D D A F B11
-C D D B F B12
-C D B F B2
-C B F C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            C A F A
+            C D A F A1
+            C D B F A2
+            C D E B F A2.1
+            C D E E A F A2.1.1
+            C D E E B F A2.1.2
+            C A F B
+            C D A F B1
+            C D D A F B11
+            C D D B F B12
+            C D B F B2
+            C B F C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     private static function createTree(OutputInterface $output, ?TreeStyle $style = null): TreeHelper
diff --git a/Tests/Input/ArgvInputTest.php b/Tests/Input/ArgvInputTest.php
index 0e76f9ee6..dead40f46 100644
--- a/Tests/Input/ArgvInputTest.php
+++ b/Tests/Input/ArgvInputTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Input;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\InputArgument;
@@ -39,9 +40,7 @@ public function testParseArguments()
         $this->assertSame(['name' => 'foo'], $input->getArguments(), '->parse() is stateless');
     }
 
-    /**
-     * @dataProvider provideOptions
-     */
+    #[DataProvider('provideOptions')]
     public function testParseOptions($input, $options, $expectedOptions, $message)
     {
         $input = new ArgvInput($input);
@@ -50,9 +49,7 @@ public function testParseOptions($input, $options, $expectedOptions, $message)
         $this->assertSame($expectedOptions, $input->getOptions(), $message);
     }
 
-    /**
-     * @dataProvider provideNegatableOptions
-     */
+    #[DataProvider('provideNegatableOptions')]
     public function testParseOptionsNegatable($input, $options, $expectedOptions, $message)
     {
         $input = new ArgvInput($input);
@@ -234,9 +231,7 @@ public static function provideNegatableOptions()
         ];
     }
 
-    /**
-     * @dataProvider provideInvalidInput
-     */
+    #[DataProvider('provideInvalidInput')]
     public function testInvalidInput($argv, $definition, $expectedExceptionMessage)
     {
         $this->expectException(\RuntimeException::class);
@@ -245,9 +240,7 @@ public function testInvalidInput($argv, $definition, $expectedExceptionMessage)
         (new ArgvInput($argv))->bind($definition);
     }
 
-    /**
-     * @dataProvider provideInvalidNegatableInput
-     */
+    #[DataProvider('provideInvalidNegatableInput')]
     public function testInvalidInputNegatable($argv, $definition, $expectedExceptionMessage)
     {
         $this->expectException(\RuntimeException::class);
@@ -509,9 +502,7 @@ public function testToString()
         $this->assertSame('-f --bar=foo '.escapeshellarg('a b c d').' '.escapeshellarg("A\nB'C"), (string) $input);
     }
 
-    /**
-     * @dataProvider provideGetParameterOptionValues
-     */
+    #[DataProvider('provideGetParameterOptionValues')]
     public function testGetParameterOptionEqualSign($argv, $key, $default, $onlyParams, $expected)
     {
         $input = new ArgvInput($argv);
@@ -574,9 +565,7 @@ public function testGetRawTokensFalse()
         $this->assertSame(['--foo', 'bar'], $input->getRawTokens());
     }
 
-    /**
-     * @dataProvider provideGetRawTokensTrueTests
-     */
+    #[DataProvider('provideGetRawTokensTrueTests')]
     public function testGetRawTokensTrue(array $argv, array $expected)
     {
         $input = new ArgvInput($argv);
diff --git a/Tests/Input/ArrayInputTest.php b/Tests/Input/ArrayInputTest.php
index 74d2c089f..96bd08b87 100644
--- a/Tests/Input/ArrayInputTest.php
+++ b/Tests/Input/ArrayInputTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Input;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
@@ -64,9 +65,7 @@ public function testParseArguments()
         $this->assertSame(['name' => 'foo'], $input->getArguments(), '->parse() parses required arguments');
     }
 
-    /**
-     * @dataProvider provideOptions
-     */
+    #[DataProvider('provideOptions')]
     public function testParseOptions($input, $options, $expectedOptions, $message)
     {
         $input = new ArrayInput($input, new InputDefinition($options));
@@ -122,9 +121,7 @@ public static function provideOptions(): array
         ];
     }
 
-    /**
-     * @dataProvider provideInvalidInput
-     */
+    #[DataProvider('provideInvalidInput')]
     public function testParseInvalidInput($parameters, $definition, $expectedExceptionMessage)
     {
         $this->expectException(\InvalidArgumentException::class);
diff --git a/Tests/Input/InputDefinitionTest.php b/Tests/Input/InputDefinitionTest.php
index ab203e6e5..3925ec8e5 100644
--- a/Tests/Input/InputDefinitionTest.php
+++ b/Tests/Input/InputDefinitionTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Input;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;
@@ -359,9 +360,7 @@ public function testGetOptionDefaults()
         $this->assertSame($defaults, $definition->getOptionDefaults(), '->getOptionDefaults() returns the default values for all options');
     }
 
-    /**
-     * @dataProvider getGetSynopsisData
-     */
+    #[DataProvider('getGetSynopsisData')]
     public function testGetSynopsis(InputDefinition $definition, $expectedSynopsis, $message = null)
     {
         $this->assertSame($expectedSynopsis, $definition->getSynopsis(), $message ? '->getSynopsis() '.$message : '');
diff --git a/Tests/Input/InputOptionTest.php b/Tests/Input/InputOptionTest.php
index 47ab503f7..e5cb3318a 100644
--- a/Tests/Input/InputOptionTest.php
+++ b/Tests/Input/InputOptionTest.php
@@ -73,8 +73,6 @@ public function testShortcut()
         $this->assertSame('0|z', $option->getShortcut(), '-0 is an acceptable shortcut value when embedded in an array');
         $option = new InputOption('foo', '0|z');
         $this->assertSame('0|z', $option->getShortcut(), '-0 is an acceptable shortcut value when embedded in a string-list');
-        $option = new InputOption('foo', false);
-        $this->assertNull($option->getShortcut(), '__construct() makes the shortcut null when given a false as value');
     }
 
     public function testModes()
diff --git a/Tests/Input/StringInputTest.php b/Tests/Input/StringInputTest.php
index 92425daab..3a97938a2 100644
--- a/Tests/Input/StringInputTest.php
+++ b/Tests/Input/StringInputTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Input;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\InputDefinition;
@@ -19,9 +20,7 @@
 
 class StringInputTest extends TestCase
 {
-    /**
-     * @dataProvider getTokenizeData
-     */
+    #[DataProvider('getTokenizeData')]
     public function testTokenize($input, $tokens, $message)
     {
         $input = new StringInput($input);
diff --git a/Tests/Logger/ConsoleLoggerTest.php b/Tests/Logger/ConsoleLoggerTest.php
index 0464c8c5f..976ff7a98 100644
--- a/Tests/Logger/ConsoleLoggerTest.php
+++ b/Tests/Logger/ConsoleLoggerTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Logger;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\InvalidArgumentException;
 use Psr\Log\LoggerInterface;
@@ -54,9 +55,7 @@ public function getLogs(): array
         return $this->output->getLogs();
     }
 
-    /**
-     * @dataProvider provideOutputMappingParams
-     */
+    #[DataProvider('provideOutputMappingParams')]
     public function testOutputMapping($logLevel, $outputVerbosity, $isOutput, $addVerbosityLevelMap = [])
     {
         $out = new BufferedOutput($outputVerbosity);
@@ -104,9 +103,7 @@ public function testImplements()
         $this->assertInstanceOf(LoggerInterface::class, $this->getLogger());
     }
 
-    /**
-     * @dataProvider provideLevelsAndMessages
-     */
+    #[DataProvider('provideLevelsAndMessages')]
     public function testLogsAtAllLevels($level, $message)
     {
         $logger = $this->getLogger();
diff --git a/Tests/Output/AnsiColorModeTest.php b/Tests/Output/AnsiColorModeTest.php
index eb3e463e8..aa1506e26 100644
--- a/Tests/Output/AnsiColorModeTest.php
+++ b/Tests/Output/AnsiColorModeTest.php
@@ -11,23 +11,20 @@
 
 namespace Symfony\Component\Console\Tests\Output;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Output\AnsiColorMode;
 
 class AnsiColorModeTest extends TestCase
 {
-    /**
-     * @dataProvider provideColorsConversion
-     */
+    #[DataProvider('provideColorsConversion')]
     public function testColorsConversionToAnsi4(string $corlorHex, array $expected)
     {
         $this->assertSame((string) $expected[AnsiColorMode::Ansi4->name], AnsiColorMode::Ansi4->convertFromHexToAnsiColorCode($corlorHex));
     }
 
-    /**
-     * @dataProvider provideColorsConversion
-     */
+    #[DataProvider('provideColorsConversion')]
     public function testColorsConversionToAnsi8(string $corlorHex, array $expected)
     {
         $this->assertSame('8;5;'.$expected[AnsiColorMode::Ansi8->name], AnsiColorMode::Ansi8->convertFromHexToAnsiColorCode($corlorHex));
diff --git a/Tests/Output/OutputTest.php b/Tests/Output/OutputTest.php
index 64e491048..cd3f09680 100644
--- a/Tests/Output/OutputTest.php
+++ b/Tests/Output/OutputTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Output;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Output\Output;
@@ -94,9 +95,7 @@ private function generateMessages(): iterable
         yield 'bar';
     }
 
-    /**
-     * @dataProvider provideWriteArguments
-     */
+    #[DataProvider('provideWriteArguments')]
     public function testWriteRawMessage($message, $type, $expectedOutput)
     {
         $output = new TestOutput();
@@ -143,9 +142,7 @@ public function testWriteWithInvalidStyle()
         $this->assertEquals("<bar>foo</bar>\n", $output->output, '->writeln() do nothing when a style does not exist');
     }
 
-    /**
-     * @dataProvider verbosityProvider
-     */
+    #[DataProvider('verbosityProvider')]
     public function testWriteWithVerbosityOption($verbosity, $expected, $msg)
     {
         $output = new TestOutput();
diff --git a/Tests/Question/ChoiceQuestionTest.php b/Tests/Question/ChoiceQuestionTest.php
index 564dee724..613cb621f 100644
--- a/Tests/Question/ChoiceQuestionTest.php
+++ b/Tests/Question/ChoiceQuestionTest.php
@@ -11,14 +11,13 @@
 
 namespace Symfony\Component\Console\Tests\Question;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 
 class ChoiceQuestionTest extends TestCase
 {
-    /**
-     * @dataProvider selectUseCases
-     */
+    #[DataProvider('selectUseCases')]
     public function testSelectUseCases($multiSelect, $answers, $expected, $message, $default = null)
     {
         $question = new ChoiceQuestion('A question', [
@@ -104,9 +103,7 @@ public function testNonTrimmable()
         $this->assertSame(['First response ', ' Second response'], $question->getValidator()('First response , Second response'));
     }
 
-    /**
-     * @dataProvider selectAssociativeChoicesProvider
-     */
+    #[DataProvider('selectAssociativeChoicesProvider')]
     public function testSelectAssociativeChoices($providedAnswer, $expectedValue)
     {
         $question = new ChoiceQuestion('A question', [
diff --git a/Tests/Question/ConfirmationQuestionTest.php b/Tests/Question/ConfirmationQuestionTest.php
index bd11047b3..4e3d99fea 100644
--- a/Tests/Question/ConfirmationQuestionTest.php
+++ b/Tests/Question/ConfirmationQuestionTest.php
@@ -11,14 +11,13 @@
 
 namespace Symfony\Component\Console\Tests\Question;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class ConfirmationQuestionTest extends TestCase
 {
-    /**
-     * @dataProvider normalizerUsecases
-     */
+    #[DataProvider('normalizerUsecases')]
     public function testDefaultRegexUsecases($default, $answers, $expected, $message)
     {
         $sut = new ConfirmationQuestion('A question', $default);
diff --git a/Tests/Question/QuestionTest.php b/Tests/Question/QuestionTest.php
index 15d8212b9..0fc26aed1 100644
--- a/Tests/Question/QuestionTest.php
+++ b/Tests/Question/QuestionTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Question;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Question\Question;
 
@@ -44,9 +45,7 @@ public function testGetDefaultDefault()
         self::assertNull($this->question->getDefault());
     }
 
-    /**
-     * @dataProvider providerTrueFalse
-     */
+    #[DataProvider('providerTrueFalse')]
     public function testIsSetHidden(bool $hidden)
     {
         $this->question->setHidden($hidden);
@@ -89,9 +88,7 @@ public function testSetHiddenWithNoAutocompleterCallback()
         $this->assertNull($exception);
     }
 
-    /**
-     * @dataProvider providerTrueFalse
-     */
+    #[DataProvider('providerTrueFalse')]
     public function testIsSetHiddenFallback(bool $hidden)
     {
         $this->question->setHiddenFallback($hidden);
@@ -122,9 +119,7 @@ public static function providerGetSetAutocompleterValues()
         ];
     }
 
-    /**
-     * @dataProvider providerGetSetAutocompleterValues
-     */
+    #[DataProvider('providerGetSetAutocompleterValues')]
     public function testGetSetAutocompleterValues($values, $expectValues)
     {
         $this->question->setAutocompleterValues($values);
@@ -143,9 +138,7 @@ public static function providerSetAutocompleterValuesInvalid()
         ];
     }
 
-    /**
-     * @dataProvider providerSetAutocompleterValuesInvalid
-     */
+    #[DataProvider('providerSetAutocompleterValuesInvalid')]
     public function testSetAutocompleterValuesInvalid($values)
     {
         self::expectException(\TypeError::class);
@@ -236,9 +229,7 @@ public static function providerGetSetValidator()
         ];
     }
 
-    /**
-     * @dataProvider providerGetSetValidator
-     */
+    #[DataProvider('providerGetSetValidator')]
     public function testGetSetValidator($callback)
     {
         $this->question->setValidator($callback);
@@ -255,9 +246,7 @@ public static function providerGetSetMaxAttempts()
         return [[1], [5], [null]];
     }
 
-    /**
-     * @dataProvider providerGetSetMaxAttempts
-     */
+    #[DataProvider('providerGetSetMaxAttempts')]
     public function testGetSetMaxAttempts($attempts)
     {
         $this->question->setMaxAttempts($attempts);
@@ -269,9 +258,7 @@ public static function providerSetMaxAttemptsInvalid()
         return [[0], [-1]];
     }
 
-    /**
-     * @dataProvider providerSetMaxAttemptsInvalid
-     */
+    #[DataProvider('providerSetMaxAttemptsInvalid')]
     public function testSetMaxAttemptsInvalid($attempts)
     {
         self::expectException(\InvalidArgumentException::class);
@@ -297,9 +284,7 @@ public function testGetNormalizerDefault()
         self::assertNull($this->question->getNormalizer());
     }
 
-    /**
-     * @dataProvider providerTrueFalse
-     */
+    #[DataProvider('providerTrueFalse')]
     public function testSetMultiline(bool $multiline)
     {
         self::assertSame($this->question, $this->question->setMultiline($multiline));
diff --git a/Tests/SignalRegistry/SignalMapTest.php b/Tests/SignalRegistry/SignalMapTest.php
index 3a0c49bb0..9bc7f34a2 100644
--- a/Tests/SignalRegistry/SignalMapTest.php
+++ b/Tests/SignalRegistry/SignalMapTest.php
@@ -11,14 +11,13 @@
 
 namespace Symfony\Component\Console\Tests\SignalRegistry;
 
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\SignalRegistry\SignalMap;
 
 class SignalMapTest extends TestCase
 {
-    /**
-     * @requires extension pcntl
-     */
+    #[RequiresPhpExtension('pcntl')]
     public function testSignalExists()
     {
         $this->assertSame('SIGINT', SignalMap::getSignalName(\SIGINT));
diff --git a/Tests/SignalRegistry/SignalRegistryTest.php b/Tests/SignalRegistry/SignalRegistryTest.php
index 92d500f9e..51146b3f2 100644
--- a/Tests/SignalRegistry/SignalRegistryTest.php
+++ b/Tests/SignalRegistry/SignalRegistryTest.php
@@ -11,12 +11,11 @@
 
 namespace Symfony\Component\Console\Tests\SignalRegistry;
 
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\SignalRegistry\SignalRegistry;
 
-/**
- * @requires extension pcntl
- */
+#[RequiresPhpExtension('pcntl')]
 class SignalRegistryTest extends TestCase
 {
     protected function tearDown(): void
diff --git a/Tests/Style/SymfonyStyleTest.php b/Tests/Style/SymfonyStyleTest.php
index a3b7ae406..e69882004 100644
--- a/Tests/Style/SymfonyStyleTest.php
+++ b/Tests/Style/SymfonyStyleTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Style;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\RuntimeException;
@@ -47,9 +48,7 @@ protected function tearDown(): void
         putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
     }
 
-    /**
-     * @dataProvider inputCommandToOutputFilesProvider
-     */
+    #[DataProvider('inputCommandToOutputFilesProvider')]
     public function testOutputs($inputCommandFilepath, $outputFilepath)
     {
         $code = require $inputCommandFilepath;
@@ -58,9 +57,7 @@ public function testOutputs($inputCommandFilepath, $outputFilepath)
         $this->assertStringEqualsFile($outputFilepath, $this->tester->getDisplay(true));
     }
 
-    /**
-     * @dataProvider inputInteractiveCommandToOutputFilesProvider
-     */
+    #[DataProvider('inputInteractiveCommandToOutputFilesProvider')]
     public function testInteractiveOutputs($inputCommandFilepath, $outputFilepath)
     {
         $code = require $inputCommandFilepath;
@@ -179,15 +176,17 @@ public function testTree()
         $tree->render();
 
         $this->assertSame(<<<TREE
-root
-├── A
-├── B
-│   ├── B1
-│   │   ├── B11
-│   │   └── B12
-│   └── B2
-└── C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            ├── A
+            ├── B
+            │   ├── B1
+            │   │   ├── B11
+            │   │   └── B12
+            │   └── B2
+            └── C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testCreateTreeWithArray()
@@ -200,15 +199,17 @@ public function testCreateTreeWithArray()
         $tree->render();
 
         $this->assertSame($tree = <<<TREE
-root
-├── A
-├── B
-│   ├── B1
-│   │   ├── B11
-│   │   └── B12
-│   └── B2
-└── C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            ├── A
+            ├── B
+            │   ├── B1
+            │   │   ├── B11
+            │   │   └── B12
+            │   └── B2
+            └── C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testCreateTreeWithIterable()
@@ -221,15 +222,17 @@ public function testCreateTreeWithIterable()
         $tree->render();
 
         $this->assertSame(<<<TREE
-root
-├── A
-├── B
-│   ├── B1
-│   │   ├── B11
-│   │   └── B12
-│   └── B2
-└── C
-TREE, self::normalizeLineBreaks(trim($output->fetch())));
+            root
+            ├── A
+            ├── B
+            │   ├── B1
+            │   │   ├── B11
+            │   │   └── B12
+            │   └── B2
+            └── C
+            TREE,
+            self::normalizeLineBreaks(trim($output->fetch()))
+        );
     }
 
     public function testCreateTreeWithConsoleOutput()
diff --git a/Tests/TerminalTest.php b/Tests/TerminalTest.php
index d43469d12..4d417dfba 100644
--- a/Tests/TerminalTest.php
+++ b/Tests/TerminalTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Output\AnsiColorMode;
 use Symfony\Component\Console\Terminal;
@@ -95,9 +96,7 @@ public function testSttyOnWindows()
         $this->assertSame((int) $matches[1], $terminal->getWidth());
     }
 
-    /**
-     * @dataProvider provideTerminalColorEnv
-     */
+    #[DataProvider('provideTerminalColorEnv')]
     public function testGetColorMode(?string $testColorTerm, ?string $testTerm, AnsiColorMode $expected)
     {
         $oriColorTerm = getenv('COLORTERM');
diff --git a/Tests/Tester/CommandTesterTest.php b/Tests/Tester/CommandTesterTest.php
index d36042038..81b866a04 100644
--- a/Tests/Tester/CommandTesterTest.php
+++ b/Tests/Tester/CommandTesterTest.php
@@ -11,18 +11,24 @@
 
 namespace Symfony\Component\Console\Tests\Tester;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Console\Tests\Fixtures\InvokableExtendingCommandTestCommand;
+use Symfony\Component\Console\Tests\Fixtures\InvokableTestCommand;
+use Symfony\Component\Console\Tests\Fixtures\InvokableWithInputTestCommand;
 
 class CommandTesterTest extends TestCase
 {
@@ -104,7 +110,7 @@ public function testCommandFromApplication()
             return 0;
         });
 
-        $application->add($command);
+        $application->addCommand($command);
 
         $tester = new CommandTester($application->find('foo'));
 
@@ -244,7 +250,7 @@ public function testCommandWithQuestionsButNoInputs()
         $tester = new CommandTester($command);
 
         $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessage('Aborted.');
+        $this->expectExceptionMessage('Aborted');
 
         $tester->execute([]);
     }
@@ -293,4 +299,154 @@ public function testErrorOutput()
 
         $this->assertSame('foo', $tester->getErrorOutput());
     }
+
+    public function testAInvokableCommand()
+    {
+        $command = new InvokableTestCommand();
+
+        $tester = new CommandTester($command);
+        $tester->execute([]);
+
+        $tester->assertCommandIsSuccessful();
+    }
+
+    public function testAInvokableExtendedCommand()
+    {
+        $command = new InvokableExtendingCommandTestCommand();
+
+        $tester = new CommandTester($command);
+        $tester->execute([]);
+
+        $tester->assertCommandIsSuccessful();
+    }
+
+    public function testInvokableDefinitionWithInputAttribute()
+    {
+        $application = new Application();
+        $application->addCommand(new InvokableWithInputTestCommand());
+        $application->setAutoExit(false);
+
+        $bufferedOutput = new BufferedOutput();
+        $statusCode = $application->run(new ArrayInput(['command' => 'help', 'command_name' => 'invokable:input:test']), $bufferedOutput);
+
+        $expectedOutput = <<<TXT
+            Usage:
+              invokable:input:test [options] [--] <username> <email> <password>
+
+            Arguments:
+              username %S
+              email %S
+              password %S
+
+            Options:
+                  --group=GROUP                           [default: "users"]
+                  --group-description=GROUP-DESCRIPTION   [default: "Standard Users"]
+                  --admin %S
+                  --active|--no-active %S
+                  --status=STATUS                         [default: "unverified"]
+            %A
+            TXT;
+
+        self::assertSame(0, $statusCode);
+        self::assertStringMatchesFormat($expectedOutput, $bufferedOutput->fetch());
+    }
+
+    #[DataProvider('getInvokableWithInputData')]
+    public function testInvokableWithInputAttribute(array $input, string $output)
+    {
+        $command = new InvokableWithInputTestCommand();
+
+        $tester = new CommandTester($command);
+        $tester->execute($input);
+
+        $tester->assertCommandIsSuccessful();
+        self::assertSame($output, $tester->getDisplay(true));
+    }
+
+    public static function getInvokableWithInputData(): iterable
+    {
+        yield 'all set' => [
+            'input' => [
+                'username' => 'user1',
+                'email' => 'user1@example.com',
+                'password' => 'password123',
+                '--admin' => true,
+                '--active' => false,
+                '--status' => 'verified',
+                '--group' => 'admins',
+                '--group-description' => 'Super Administrators',
+            ],
+            'output' => <<<TXT
+                user1
+                user1@example.com
+                password123
+                yes
+                no
+                verified
+                admins
+                Super Administrators
+
+                TXT,
+        ];
+
+        yield 'only required arguments' => [
+            'input' => [
+                'username' => 'test',
+                'email' => 'test@example.com',
+                'password' => 'password123',
+            ],
+            'output' => <<<TXT
+                test
+                test@example.com
+                password123
+                no
+                yes
+                unverified
+                users
+                Standard Users
+
+                TXT,
+        ];
+
+        yield 'admin enabled with defaults' => [
+            'input' => [
+                'username' => 'admin',
+                'email' => 'admin@example.com',
+                'password' => 'admin123',
+                '--admin' => true,
+            ],
+            'output' => <<<TXT
+                admin
+                admin@example.com
+                admin123
+                yes
+                yes
+                unverified
+                users
+                Standard Users
+
+                TXT,
+        ];
+
+        yield 'custom group with defaults' => [
+            'input' => [
+                'username' => 'user',
+                'email' => 'user@custom.com',
+                'password' => 'custom123',
+                '--group' => 'moderators',
+                '--group-description' => 'System Moderators',
+            ],
+            'output' => <<<TXT
+                user
+                user@custom.com
+                custom123
+                no
+                yes
+                unverified
+                moderators
+                System Moderators
+
+                TXT,
+        ];
+    }
 }
diff --git a/Tests/Tester/Constraint/CommandIsSuccessfulTest.php b/Tests/Tester/Constraint/CommandIsSuccessfulTest.php
index 61ab5d0f8..415f3861f 100644
--- a/Tests/Tester/Constraint/CommandIsSuccessfulTest.php
+++ b/Tests/Tester/Constraint/CommandIsSuccessfulTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Tester\Constraint;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Command\Command;
@@ -27,9 +28,7 @@ public function testConstraint()
         $this->assertFalse($constraint->evaluate(Command::INVALID, '', true));
     }
 
-    /**
-     * @dataProvider providesUnsuccessful
-     */
+    #[DataProvider('providesUnsuccessful')]
     public function testUnsuccessfulCommand(string $expectedException, int $exitCode)
     {
         $constraint = new CommandIsSuccessful();
diff --git a/Tests/phpt/alarm/command_exit.phpt b/Tests/phpt/alarm/command_exit.phpt
index c2cf3edc7..a53af8567 100644
--- a/Tests/phpt/alarm/command_exit.phpt
+++ b/Tests/phpt/alarm/command_exit.phpt
@@ -53,7 +53,7 @@ class MyCommand extends Command
 
 $app = new Application();
 $app->setDispatcher(new \Symfony\Component\EventDispatcher\EventDispatcher());
-$app->add(new MyCommand('foo'));
+$app->addCommand(new MyCommand('foo'));
 
 $app
     ->setDefaultCommand('foo', true)
diff --git a/Tests/phpt/signal/command_exit.phpt b/Tests/phpt/signal/command_exit.phpt
index e14f80c47..e653d65c1 100644
--- a/Tests/phpt/signal/command_exit.phpt
+++ b/Tests/phpt/signal/command_exit.phpt
@@ -45,7 +45,7 @@ class MyCommand extends Command
 
 $app = new Application();
 $app->setDispatcher(new \Symfony\Component\EventDispatcher\EventDispatcher());
-$app->add(new MyCommand('foo'));
+$app->addCommand(new MyCommand('foo'));
 
 $app
     ->setDefaultCommand('foo', true)
diff --git a/composer.json b/composer.json
index 65d69913a..109cdd762 100644
--- a/composer.json
+++ b/composer.json
@@ -20,19 +20,19 @@
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/service-contracts": "^2.5|^3",
-        "symfony/string": "^7.2"
+        "symfony/string": "^7.2|^8.0"
     },
     "require-dev": {
-        "symfony/config": "^6.4|^7.0",
-        "symfony/event-dispatcher": "^6.4|^7.0",
-        "symfony/http-foundation": "^6.4|^7.0",
-        "symfony/http-kernel": "^6.4|^7.0",
-        "symfony/dependency-injection": "^6.4|^7.0",
-        "symfony/lock": "^6.4|^7.0",
-        "symfony/messenger": "^6.4|^7.0",
-        "symfony/process": "^6.4|^7.0",
-        "symfony/stopwatch": "^6.4|^7.0",
-        "symfony/var-dumper": "^6.4|^7.0",
+        "symfony/config": "^6.4|^7.0|^8.0",
+        "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
+        "symfony/http-foundation": "^6.4|^7.0|^8.0",
+        "symfony/http-kernel": "^6.4|^7.0|^8.0",
+        "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+        "symfony/lock": "^6.4|^7.0|^8.0",
+        "symfony/messenger": "^6.4|^7.0|^8.0",
+        "symfony/process": "^6.4|^7.0|^8.0",
+        "symfony/stopwatch": "^6.4|^7.0|^8.0",
+        "symfony/var-dumper": "^6.4|^7.0|^8.0",
         "psr/log": "^1|^2|^3"
     },
     "provide": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0e96921be..950f1c096 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
+         failOnDeprecation="true"
          failOnRisky="true"
          failOnWarning="true"
 >
@@ -18,7 +19,7 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source ignoreSuppressionOfDeprecations="true">
         <include>
             <directory>./</directory>
         </include>
@@ -27,15 +28,11 @@
             <directory>./Tests</directory>
             <directory>./vendor</directory>
         </exclude>
-    </coverage>
+    </source>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
-            <arguments>
-                <array>
-                    <element key="time-sensitive"><string>Symfony\Component\Console</string></element>
-                </array>
-            </arguments>
-        </listener>
-    </listeners>
+    <extensions>
+        <bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension">
+            <parameter name="clock-mock-namespaces" value="Symfony\Component\Console" />
+        </bootstrap>
+    </extensions>
 </phpunit>