Update command signature and fix tests

Author: AydinHassan

src/Command/RunCommand.php

@@ -4,6 +4,7 @@
 
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use PhpSchool\PhpWorkshop\ExerciseRepository;
+use PhpSchool\PhpWorkshop\Input\Input;
 use PhpSchool\PhpWorkshop\Output\OutputInterface;
 use PhpSchool\PhpWorkshop\UserState;
 use PhpSchool\PhpWorkshop\UserStateSerializer;
@@ -62,13 +63,13 @@ public function __construct(
     }
 
     /**
-     * @param string $appName
-     * @param string $program
+     * @param Input $input The command line arguments passed to the command.
      *
      * @return int|void
      */
-    public function __invoke($appName, $program)
+    public function __invoke(Input $input)
     {
+        $program = $input->getArgument('program');
         if (!file_exists($program)) {
             $this->output->printError(
                 sprintf('Could not run. File: "%s" does not exist', $program)

src/Command/VerifyCommand.php

@@ -5,6 +5,7 @@
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use PhpSchool\PhpWorkshop\ExerciseRepository;
 use PhpSchool\PhpWorkshop\ExerciseRunner;
+use PhpSchool\PhpWorkshop\Input\Input;
 use PhpSchool\PhpWorkshop\Output\OutputInterface;
 use PhpSchool\PhpWorkshop\ResultRenderer\ResultsRenderer;
 use PhpSchool\PhpWorkshop\UserState;
@@ -72,13 +73,13 @@ public function __construct(
     }
 
     /**
-     * @param string $appName
-     * @param string $program
+     * @param Input $input The command line arguments passed to the command.
      *
      * @return int|void
      */
-    public function __invoke($appName, $program)
+    public function __invoke(Input $input)
     {
+        $program = $input->getArgument('program');
         if (!file_exists($program)) {
             $this->output->printError(
                 sprintf('Could not verify. File: "%s" does not exist', $program)
@@ -93,7 +94,7 @@ public function __invoke($appName, $program)
         }
 
         $exercise   = $this->exerciseRepository->findByName($this->userState->getCurrentExercise());
-        $results    = $this->exerciseDispatcher->verify($exercise, $program);
+        $results    = $this->exerciseDispatcher->verify($exercise, $input);
 
         if ($results->isSuccessful()) {
             $this->userState->addCompletedExercise($exercise->getName());

test/Command/VerifyCommandTest.php

@@ -6,6 +6,7 @@
 use PhpSchool\CliMenu\Terminal\TerminalInterface;
 use PhpSchool\PhpWorkshop\Check\CheckInterface;
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
+use PhpSchool\PhpWorkshop\Input\Input;
 use PhpSchool\PhpWorkshop\Output\OutputInterface;
 use PhpSchool\PhpWorkshop\Output\StdOutput;
 use PHPUnit_Framework_TestCase;
@@ -58,7 +59,7 @@ public function testVerifyPrintsErrorIfProgramDoesNotExist()
         $renderer = $this->createMock(ResultsRenderer::class);
 
         $command = new VerifyCommand($repo, $dispatcher, $state, $serializer, $output, $renderer);
-        $this->assertSame(1, $command->__invoke('appname', $programFile));
+        $this->assertSame(1, $command->__invoke(new Input('appName', ['program' => $programFile])));
     }
 
     public function testVerifyPrintsErrorIfNoExerciseAssigned()
@@ -80,7 +81,7 @@ public function testVerifyPrintsErrorIfNoExerciseAssigned()
         $renderer = $this->createMock(ResultsRenderer::class);
 
         $command = new VerifyCommand($repo, $dispatcher, $state, $serializer, $output, $renderer);
-        $this->assertSame(1, $command->__invoke('appname', $file));
+        $this->assertSame(1, $command->__invoke(new Input('appName', ['program' => $file])));
 
         unlink($file);
     }
@@ -90,6 +91,8 @@ public function testVerifyAddsCompletedExerciseAndReturnsCorrectCodeOnSuccess()
         $file = tempnam(sys_get_temp_dir(), 'pws');
         touch($file);
 
+        $input = new Input('appName', ['program' => $file]);
+
         $e = $this->createMock(ExerciseInterface::class);
         $e->expects($this->any())
             ->method('getName')
@@ -117,17 +120,17 @@ public function testVerifyAddsCompletedExerciseAndReturnsCorrectCodeOnSuccess()
         $dispatcher
             ->expects($this->once())
             ->method('verify')
-            ->with($e, $file)
+            ->with($e, $input)
             ->will($this->returnValue($results));
 
         $renderer
             ->expects($this->once())
             ->method('render')
             ->with($results, $e, $state, $output);
-        
+
 
         $command = new VerifyCommand($repo, $dispatcher, $state, $serializer, $output, $renderer);
-        $this->assertEquals(0, $command->__invoke('appname', $file));
+        $this->assertEquals(0, $command->__invoke($input));
         $this->assertEquals(['exercise1'], $state->getCompletedExercises());
         unlink($file);
     }
@@ -137,6 +140,8 @@ public function testVerifyDoesNotAddCompletedExerciseAndReturnsCorrectCodeOnFail
         $file = tempnam(sys_get_temp_dir(), 'pws');
         touch($file);
 
+        $input = new Input('appName', ['program' => $file]);
+
         $e = $this->createMock(ExerciseInterface::class);
         $e->expects($this->any())
             ->method('getName')
@@ -165,7 +170,7 @@ public function testVerifyDoesNotAddCompletedExerciseAndReturnsCorrectCodeOnFail
         $dispatcher
             ->expects($this->once())
             ->method('verify')
-            ->with($e, $file)
+            ->with($e, $input)
             ->will($this->returnValue($results));
 
         $renderer
@@ -174,7 +179,7 @@ public function testVerifyDoesNotAddCompletedExerciseAndReturnsCorrectCodeOnFail
             ->with($results, $e, $state, $output);
 
         $command = new VerifyCommand($repo, $dispatcher, $state, $serializer, $output, $renderer);
-        $this->assertEquals(1, $command->__invoke('appname', $file));
+        $this->assertEquals(1, $command->__invoke($input));
         $this->assertEquals([], $state->getCompletedExercises());
         unlink($file);
     }