Use new runner events in cgi + cli runner

Author: AydinHassan

src/ExerciseRunner/CgiRunner.php

@@ -8,13 +8,12 @@
 use PhpSchool\PhpWorkshop\Event\CgiExecuteEvent;
 use PhpSchool\PhpWorkshop\Event\Event;
 use PhpSchool\PhpWorkshop\Event\EventDispatcher;
+use PhpSchool\PhpWorkshop\Event\ExerciseRunnerEvent;
 use PhpSchool\PhpWorkshop\Exception\CodeExecutionException;
 use PhpSchool\PhpWorkshop\Exception\SolutionExecutionException;
 use PhpSchool\PhpWorkshop\Exercise\CgiExercise;
-use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use PhpSchool\PhpWorkshop\Input\Input;
 use PhpSchool\PhpWorkshop\Output\OutputInterface;
-use PhpSchool\PhpWorkshop\Result\CgiOutFailure;
 use PhpSchool\PhpWorkshop\Result\CgiOutRequestFailure;
 use PhpSchool\PhpWorkshop\Result\CgiOutResult;
 use PhpSchool\PhpWorkshop\Result\Failure;
@@ -237,7 +236,8 @@ private function getProcess($fileName, RequestInterface $request)
      */
     public function verify(Input $input)
     {
-        return new CgiOutResult(
+        $this->eventDispatcher->dispatch(new ExerciseRunnerEvent('cgi.verify.start', $this->exercise, $input));
+        $result = new CgiOutResult(
             $this->getName(),
             array_map(
                 function (RequestInterface $request) use ($input) {
@@ -246,6 +246,8 @@ function (RequestInterface $request) use ($input) {
                 $this->exercise->getRequests()
             )
         );
+        $this->eventDispatcher->dispatch(new ExerciseRunnerEvent('cgi.verify.finish', $this->exercise, $input));
+        return $result;
     }
 
     /**
@@ -267,6 +269,7 @@ function (RequestInterface $request) use ($input) {
      */
     public function run(Input $input, OutputInterface $output)
     {
+        $this->eventDispatcher->dispatch(new ExerciseRunnerEvent('cgi.run.start', $this->exercise, $input));
         $success = true;
         foreach ($this->exercise->getRequests() as $i => $request) {
             $event = $this->eventDispatcher->dispatch(
@@ -295,6 +298,7 @@ public function run(Input $input, OutputInterface $output)
 
             $output->lineBreak();
         }
+        $this->eventDispatcher->dispatch(new ExerciseRunnerEvent('cgi.run.finish', $this->exercise, $input));
         return $success;
     }
 }

src/ExerciseRunner/CliRunner.php

@@ -8,10 +8,10 @@
 use PhpSchool\PhpWorkshop\Event\CliExecuteEvent;
 use PhpSchool\PhpWorkshop\Event\Event;
 use PhpSchool\PhpWorkshop\Event\EventDispatcher;
+use PhpSchool\PhpWorkshop\Event\ExerciseRunnerEvent;
 use PhpSchool\PhpWorkshop\Exception\CodeExecutionException;
 use PhpSchool\PhpWorkshop\Exception\SolutionExecutionException;
 use PhpSchool\PhpWorkshop\Exercise\CliExercise;
-use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use PhpSchool\PhpWorkshop\Input\Input;
 use PhpSchool\PhpWorkshop\Output\OutputInterface;
 use PhpSchool\PhpWorkshop\Result\Failure;
@@ -127,6 +127,18 @@ private function getPhpProcess($fileName, ArrayObject $args)
      * @return ResultInterface The result of the check.
      */
     public function verify(Input $input)
+    {
+        $this->eventDispatcher->dispatch(new ExerciseRunnerEvent('cli.verify.start', $this->exercise, $input));
+        $result = $this->doVerify($input);
+        $this->eventDispatcher->dispatch(new ExerciseRunnerEvent('cli.verify.finish', $this->exercise, $input));
+        return $result;
+    }
+
+    /**
+     * @param Input $input
+     * @return ResultInterface
+     */
+    private function doVerify(Input $input)
     {
         //arrays are not pass-by-ref
         $args = new ArrayObject($this->exercise->getArgs());
@@ -175,6 +187,7 @@ public function verify(Input $input)
      */
     public function run(Input $input, OutputInterface $output)
     {
+        $this->eventDispatcher->dispatch(new ExerciseRunnerEvent('cli.run.start', $this->exercise, $input));
         /** @var CliExecuteEvent $event */
         $event = $this->eventDispatcher->dispatch(
             new CliExecuteEvent('cli.run.student-execute.pre', new ArrayObject($this->exercise->getArgs()))
@@ -200,6 +213,7 @@ public function run(Input $input, OutputInterface $output)
             $output->writeLine($outputBuffer);
         });
 
+        $this->eventDispatcher->dispatch(new ExerciseRunnerEvent('cli.run.finish', $this->exercise, $input));
         return $process->isSuccessful();
     }
 }