Merge branch '4.4' into 5.4

* 4.4: [Console] Better required argument check in InputArgument [EventDispatcher] Fix removing listeners when using first-class callable syntax
symfony · May 5, 2022 · 4f43a3f · 4f43a3f
2 parents ffe3aed + 3aac1c4
commit 4f43a3f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Input/InputArgument.php b/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/Tests/Input/InputArgumentTest.php b/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);