symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Console/Attribute/Argument.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Console/Attribute/Argument.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Console/Attribute/Option.php
Lines changed: 7 additions & 10 deletions b/‎src/Symfony/Component/Console/Attribute/Option.php
Lines changed: 7 additions & 10 deletions
diff --git a/‎src/Symfony/Component/Console/Command/InvokableCommand.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Console/Command/InvokableCommand.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
Lines changed: 78 additions & 2 deletions b/‎src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
Lines changed: 78 additions & 2 deletions
@@ -610,7 +610,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->registerForAutoconfiguration(AssetCompilerInterface::class)
             ->addTag('asset_mapper.compiler');
         $container->registerAttributeForAutoconfiguration(AsCommand::class, static function (ChildDefinition $definition, AsCommand $attribute, \ReflectionClass $reflector): void {
-            $definition->addTag('console.command', ['command' => $attribute->name, 'description' => $attribute->description ?? $reflector->getName()]);
+            $definition->addTag('console.command', ['command' => $attribute->name, 'description' => $attribute->description]);
         });
         $container->registerForAutoconfiguration(Command::class)
             ->addTag('console.command');
 
@@ -29,8 +29,8 @@ class Argument
      *
      * If unset, the `name` and `default` values will be inferred from the parameter definition.
      *
-     * @param string|bool|int|float|array|null                               $default         The default value (for InputArgument::OPTIONAL mode only)
-     * @param array|callable-string(CompletionInput):list<string|Suggestion> $suggestedValues The values used for input completion
+     * @param string|bool|int|float|array|null                                                  $default         The default value (for InputArgument::OPTIONAL mode only)
+     * @param array<string|Suggestion>|callable-string(CompletionInput):list<string|Suggestion> $suggestedValues The values used for input completion
      */
     public function __construct(
         public string $name = '',
 
@@ -30,9 +30,9 @@ class Option
      *
      * If unset, the `name` and `default` values will be inferred from the parameter definition.
      *
-     * @param array|string|null                                              $shortcut        The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
-     * @param scalar|array|null                                              $default         The default value (must be null for self::VALUE_NONE)
-     * @param array|callable-string(CompletionInput):list<string|Suggestion> $suggestedValues The values used for input completion
+     * @param array|string|null                                                                 $shortcut        The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
+     * @param scalar|array|null                                                                 $default         The default value (must be null for self::VALUE_NONE)
+     * @param array<string|Suggestion>|callable-string(CompletionInput):list<string|Suggestion> $suggestedValues The values used for input completion
      */
     public function __construct(
         public string $name = '',
@@ -76,17 +76,13 @@ public static function tryFrom(\ReflectionParameter $parameter): ?self
         if ('bool' === $self->typeName) {
             $self->mode = InputOption::VALUE_NONE | InputOption::VALUE_NEGATABLE;
         } else {
-            $self->mode = null !== $self->default || $parameter->isDefaultValueAvailable() ? InputOption::VALUE_OPTIONAL : InputOption::VALUE_REQUIRED;
+            $self->mode = InputOption::VALUE_REQUIRED;
             if ('array' === $self->typeName) {
                 $self->mode |= InputOption::VALUE_IS_ARRAY;
             }
         }
 
-        if (InputOption::VALUE_NONE === (InputOption::VALUE_NONE & $self->mode)) {
-            $self->default = null;
-        } else {
-            $self->default ??= $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null;
-        }
+        $self->default ??= $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null;
 
         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]])) {
             $self->suggestedValues = [$instance, $self->suggestedValues[1]];
@@ -100,9 +96,10 @@ public static function tryFrom(\ReflectionParameter $parameter): ?self
      */
     public function toInputOption(): InputOption
     {
+        $default = InputOption::VALUE_NONE === (InputOption::VALUE_NONE & $this->mode) ? null : $this->default;
         $suggestedValues = \is_callable($this->suggestedValues) ? ($this->suggestedValues)(...) : $this->suggestedValues;
 
-        return new InputOption($this->name, $this->shortcut, $this->mode, $this->description, $this->default, $suggestedValues);
+        return new InputOption($this->name, $this->shortcut, $this->mode, $this->description, $default, $suggestedValues);
     }
 
     /**
 
@@ -49,7 +49,7 @@ public function __invoke(InputInterface $input, OutputInterface $output): int
 
         if (null !== $statusCode && !\is_int($statusCode)) {
             if ($this->triggerDeprecations) {
-                trigger_deprecation('symfony/console', '7.3', \sprintf('Returning a non-integer value from the command "%s" is deprecated and will throw an exception in PHP 8.0.', $this->command->getName()));
+                trigger_deprecation('symfony/console', '7.3', \sprintf('Returning a non-integer value from the command "%s" is deprecated and will throw an exception in Symfony 8.0.', $this->command->getName()));
 
                 return 0;
             }
@@ -97,7 +97,7 @@ private function getParameters(InputInterface $input, OutputInterface $output):
 
             if (!$type instanceof \ReflectionNamedType) {
                 if ($this->triggerDeprecations) {
-                    trigger_deprecation('symfony/console', '7.3', \sprintf('Omitting the type declaration for the parameter "$%s" is deprecated and will throw an exception in PHP 8.0.', $parameter->getName()));
+                    trigger_deprecation('symfony/console', '7.3', \sprintf('Omitting the type declaration for the parameter "$%s" is deprecated and will throw an exception in Symfony 8.0.', $parameter->getName()));
 
                     continue;
                 }
 
@@ -18,7 +18,10 @@
 use Symfony\Component\Console\Completion\CompletionInput;
 use Symfony\Component\Console\Completion\CompletionSuggestions;
 use Symfony\Component\Console\Completion\Suggestion;
+use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Exception\LogicException;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\NullOutput;
 
 class InvokableCommandTest extends TestCase
 {
@@ -76,7 +79,7 @@ public function testCommandInputOptionDefinition()
 
         $typeInputOption = $command->getDefinition()->getOption('type');
         self::assertSame('type', $typeInputOption->getName());
-        self::assertFalse($typeInputOption->isValueRequired());
+        self::assertTrue($typeInputOption->isValueRequired());
         self::assertSame('USER_TYPE', $typeInputOption->getDefault());
 
         $verboseInputOption = $command->getDefinition()->getOption('verbose');
@@ -94,7 +97,7 @@ public function testCommandInputOptionDefinition()
 
         $rolesInputOption = $command->getDefinition()->getOption('roles');
         self::assertSame('roles', $rolesInputOption->getName());
-        self::assertFalse($rolesInputOption->isValueRequired());
+        self::assertTrue($rolesInputOption->isValueRequired());
         self::assertTrue($rolesInputOption->isArray());
         self::assertSame(['ROLE_USER'], $rolesInputOption->getDefault());
         self::assertTrue($rolesInputOption->hasCompletion());
@@ -124,6 +127,79 @@ public function testInvalidOptionType()
         $command->getDefinition();
     }
 
+    /**
+     * @dataProvider provideBinaryInputOptions
+     */
+    public function testBinaryInputOptions(array $parameters, array $expected)
+    {
+        $command = new Command('foo');
+        $command->setCode(function (
+            #[Option] bool $a,
+            #[Option] bool $b = true,
+            #[Option] bool $c = false,
+        ) use ($expected) {
+            $this->assertSame($expected[0], $a);
+            $this->assertSame($expected[1], $b);
+            $this->assertSame($expected[2], $c);
+        });
+
+        $command->run(new ArrayInput($parameters), new NullOutput());
+    }
+
+    public static function provideBinaryInputOptions(): \Generator
+    {
+        yield 'defaults' => [[], [false, true, false]];
+        yield 'positive' => [['--a' => null, '--b' => null, '--c' => null], [true, true, true]];
+        yield 'negative' => [['--no-a' => null, '--no-b' => null, '--no-c' => null], [false, false, false]];
+    }
+
+    /**
+     * @dataProvider provideNonBinaryInputOptions
+     */
+    public function testNonBinaryInputOptions(array $parameters, array $expected)
+    {
+        $command = new Command('foo');
+        $command->setCode(function (
+            #[Option] ?string $a = null,
+            #[Option] string $b = 'b',
+            #[Option] array $c = [],
+        ) use ($expected) {
+            $this->assertSame($expected[0], $a);
+            $this->assertSame($expected[1], $b);
+            $this->assertSame($expected[2], $c);
+        });
+
+        $command->run(new ArrayInput($parameters), new NullOutput());
+    }
+
+    public static function provideNonBinaryInputOptions(): \Generator
+    {
+        yield 'defaults' => [[], [null, 'b', []]];
+        yield 'value-required' => [['--a' => 'x', '--b' => 'y', '--c' => ['z']], ['x', 'y', ['z']]];
+    }
+
+    public function testInvalidRequiredValueOption()
+    {
+        $command = new Command('foo');
+        $command->setCode(function (#[Option] string $a) {});
+
+        $this->expectException(InvalidOptionException::class);
+        $this->expectExceptionMessage('The "--a" option requires a value.');
+
+        $command->run(new ArrayInput(['--a' => null]), new NullOutput());
+    }
+
+    public function testInvalidRequiredValueOptionEvenWithDefault()
+    {
+        $command = new Command('foo');
+        $command->setCode(function (#[Option] string $a = 'a') {});
+
+        $this->expectException(InvalidOptionException::class);
+        $this->expectExceptionMessage('The "--a" option requires a value.');
+
+        $command->run(new ArrayInput(['--a' => null]), new NullOutput());
+    }
+
     public function getSuggestedRoles(CompletionInput $input): array
     {
         return ['ROLE_ADMIN', 'ROLE_USER'];