[console] Negatable option are null by default

jderusse · jderusse · commit 22cb37cc858a · 2021-04-29T15:43:07.000+02:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -1036,7 +1036,7 @@ protected function getDefaultInputDefinition()
             new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
             new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
             new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
-            new InputOption('--ansi', '', InputOption::VALUE_NEGATABLE, 'Force (or disable --no-ansi) ANSI output', null),
+            new InputOption('--ansi', '', InputOption::VALUE_NEGATABLE, 'Force (or disable --no-ansi) ANSI output', false),
             new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),
         ]);
     }
diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
@@ -186,9 +186,6 @@ public function setDefault($default = null)
         if (self::VALUE_NONE === (self::VALUE_NONE & $this->mode) && null !== $default) {
             throw new LogicException('Cannot set a default value when using InputOption::VALUE_NONE mode.');
         }
-        if (self::VALUE_NEGATABLE === (self::VALUE_NEGATABLE & $this->mode) && null !== $default) {
-            throw new LogicException('Cannot set a default value when using InputOption::VALUE_NEGATABLE mode.');
-        }
 
         if ($this->isArray()) {
             if (null === $default) {
@@ -198,7 +195,7 @@ public function setDefault($default = null)
             }
         }
 
-        $this->default = $this->acceptValue() ? $default : false;
+        $this->default = $this->acceptValue() || $this->isNegatable() ? $default : false;
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -214,6 +214,24 @@ public function provideNegatableOptions()
                 ['foo' => false],
                 '->parse() parses long options without a value',
             ],
+            [
+                ['cli.php'],
+                [new InputOption('foo', null, InputOption::VALUE_NEGATABLE)],
+                ['foo' => null],
+                '->parse() parses long options without a value',
+            ],
+            [
+                ['cli.php'],
+                [new InputOption('foo', null, InputOption::VALUE_NONE | InputOption::VALUE_NEGATABLE)],
+                ['foo' => null],
+                '->parse() parses long options without a value',
+            ],
+            [
+                ['cli.php'],
+                [new InputOption('foo', null, InputOption::VALUE_NEGATABLE, '', false)],
+                ['foo' => false],
+                '->parse() parses long options without a value',
+            ],
         ];
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php b/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php
@@ -164,14 +164,6 @@ public function testDefaultValueWithValueNoneMode()
         $option->setDefault('default');
     }
 
-    public function testDefaultValueWithValueBooleanMode()
-    {
-        $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('Cannot set a default value when using InputOption::VALUE_NEGATABLE mode.');
-        $option = new InputOption('foo', 'f', InputOption::VALUE_NEGATABLE);
-        $option->setDefault('default');
-    }
-
     public function testDefaultValueWithIsArrayMode()
     {
         $this->expectException(\LogicException::class);

Original file line number	Diff line number	Diff line change
`@@ -1036,7 +1036,7 @@ protected function getDefaultInputDefinition()`
`1036`	`1036`	`new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),`
`1037`	`1037`	`new InputOption('--verbose', '-v\|vv\|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),`
`1038`	`1038`	`new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),`
`1039`		`- new InputOption('--ansi', '', InputOption::VALUE_NEGATABLE, 'Force (or disable --no-ansi) ANSI output', null),`
	`1039`	`+ new InputOption('--ansi', '', InputOption::VALUE_NEGATABLE, 'Force (or disable --no-ansi) ANSI output', false),`
`1040`	`1040`	`new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),`
`1041`	`1041`	`]);`
`1042`	`1042`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,6 @@ public function setDefault($default = null)`
`186`	`186`	`if (self::VALUE_NONE === (self::VALUE_NONE & $this->mode) && null !== $default) {`
`187`	`187`	`throw new LogicException('Cannot set a default value when using InputOption::VALUE_NONE mode.');`
`188`	`188`	`}`
`189`		`- if (self::VALUE_NEGATABLE === (self::VALUE_NEGATABLE & $this->mode) && null !== $default) {`
`190`		`- throw new LogicException('Cannot set a default value when using InputOption::VALUE_NEGATABLE mode.');`
`191`		`- }`
`192`	`189`
`193`	`190`	`if ($this->isArray()) {`
`194`	`191`	`if (null === $default) {`
`@@ -198,7 +195,7 @@ public function setDefault($default = null)`
`198`	`195`	`}`
`199`	`196`	`}`
`200`	`197`
`201`		`- $this->default = $this->acceptValue() ? $default : false;`
	`198`	`+ $this->default = $this->acceptValue() \|\| $this->isNegatable() ? $default : false;`
`202`	`199`	`}`
`203`	`200`
`204`	`201`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -164,14 +164,6 @@ public function testDefaultValueWithValueNoneMode()`
`164`	`164`	`$option->setDefault('default');`
`165`	`165`	`}`
`166`	`166`
`167`		`- public function testDefaultValueWithValueBooleanMode()`
`168`		`- {`
`169`		`- $this->expectException(\LogicException::class);`
`170`		`- $this->expectExceptionMessage('Cannot set a default value when using InputOption::VALUE_NEGATABLE mode.');`
`171`		`- $option = new InputOption('foo', 'f', InputOption::VALUE_NEGATABLE);`
`172`		`- $option->setDefault('default');`
`173`		`- }`
`174`		`-`
`175`	`167`	`public function testDefaultValueWithIsArrayMode()`
`176`	`168`	`{`
`177`	`169`	`$this->expectException(\LogicException::class);`