Merge pull request #70 from mcaskill/revert-sub-command-array-input

Revert "Use ArrayInput instead of StringInput"
mnapoli · Jul 17, 2023 · 895b189 · 895b189
2 parents a0549ae + c48bfb0
commit 895b189
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -15,7 +15,6 @@
 use Silly\Command\Command;
 use Silly\Command\ExpressionParser;
 use Symfony\Component\Console\Application as SymfonyApplication;
-use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\Input;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\StringInput;
@@ -169,7 +168,7 @@ public function runCommand($command, OutputInterface $output = null)
 
         $command = $this->find($this->getCommandName($input));
 
-        return $command->run(new ArrayInput($input->getArguments()), $output ?: new NullOutput());
+        return $command->run($input, $output ?: new NullOutput());
     }
 
     /**

diff --git a/tests/ApplicationTest.php b/tests/ApplicationTest.php
@@ -66,6 +66,41 @@ public function runs_a_command()
         $this->assertSame(0, $code);
     }
 
+    /**
+     * @test
+     */
+    public function runs_a_command_with_arguments()
+    {
+        $this->application->command('greet [name] [--yell]', function ($name, $yell, OutputInterface $output) {
+            if ($name) {
+                $text = 'Hello, '.$name;
+            } else {
+                $text = 'Hello';
+            }
+
+            if ($yell) {
+                $text = strtoupper($text);
+            }
+
+            $output->write($text);
+        });
+
+        $output = new SpyOutput();
+        $code = $this->application->runCommand('greet', $output);
+        $this->assertSame('Hello', $output->output);
+        $this->assertSame(0, $code);
+
+        $output = new SpyOutput();
+        $code = $this->application->runCommand('greet John', $output);
+        $this->assertSame('Hello, John', $output->output);
+        $this->assertSame(0, $code);
+
+        $output = new SpyOutput();
+        $code = $this->application->runCommand('greet John --yell', $output);
+        $this->assertSame('HELLO, JOHN', $output->output);
+        $this->assertSame(0, $code);
+    }
+
     /**
      * @test
      */