[Console] Better required argument check in InputArgument

jnoordsij · nicolas-grekas · commit 89dd2bb2495c · 2022-05-05T18:42:44.000+02:00
diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php
@@ -92,7 +92,7 @@ public function isArray()
      */
     public function setDefault($default = null)
     {
-        if (self::REQUIRED === $this->mode && null !== $default) {
+        if ($this->isRequired() && null !== $default) {
             throw new LogicException('Cannot set a default value except for InputArgument::OPTIONAL mode.');
         }
 
diff --git a/src/Symfony/Component/Console/Tests/Input/InputArgumentTest.php b/src/Symfony/Component/Console/Tests/Input/InputArgumentTest.php
@@ -88,6 +88,14 @@ public function testSetDefaultWithRequiredArgument()
         $argument->setDefault('default');
     }
 
+    public function testSetDefaultWithRequiredArrayArgument()
+    {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cannot set a default value except for InputArgument::OPTIONAL mode.');
+        $argument = new InputArgument('foo', InputArgument::REQUIRED | InputArgument::IS_ARRAY);
+        $argument->setDefault([]);
+    }
+
     public function testSetDefaultWithArrayArgument()
     {
         $this->expectException(\LogicException::class);

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function isArray()`
`92`	`92`	`*/`
`93`	`93`	`public function setDefault($default = null)`
`94`	`94`	`{`
`95`		`- if (self::REQUIRED === $this->mode && null !== $default) {`
	`95`	`+ if ($this->isRequired() && null !== $default) {`
`96`	`96`	`throw new LogicException('Cannot set a default value except for InputArgument::OPTIONAL mode.');`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,14 @@ public function testSetDefaultWithRequiredArgument()`
`88`	`88`	`$argument->setDefault('default');`
`89`	`89`	`}`
`90`	`90`
	`91`	`+ public function testSetDefaultWithRequiredArrayArgument()`
	`92`	`+ {`
	`93`	`+ $this->expectException(\LogicException::class);`
	`94`	`+ $this->expectExceptionMessage('Cannot set a default value except for InputArgument::OPTIONAL mode.');`
	`95`	`+ $argument = new InputArgument('foo', InputArgument::REQUIRED \| InputArgument::IS_ARRAY);`
	`96`	`+ $argument->setDefault([]);`
	`97`	`+ }`
	`98`	`+`
`91`	`99`	`public function testSetDefaultWithArrayArgument()`
`92`	`100`	`{`
`93`	`101`	`$this->expectException(\LogicException::class);`