Merge pull request #116 from php-school/consistent-event-names

BC BREAK: Make event names consisten and coherent

Author: AydinHassan

src/Check/DatabaseCheck.php

@@ -110,12 +110,12 @@ public function attach(EventDispatcher $eventDispatcher)
             $e->getParameter('exercise')->seed($db);
         });
 
-        $eventDispatcher->listen('cli.verify.solution-execute.pre', function (CliExecuteEvent $e) {
+        $eventDispatcher->listen('cli.verify.reference-execute.pre', function (CliExecuteEvent $e) {
             $e->prependArg($this->solutionDsn);
         });
 
         $eventDispatcher->listen(
-            ['cli.verify.user-execute.pre', 'cli.run.user-execute.pre'],
+            ['cli.verify.student-execute.pre', 'cli.run.student-execute.pre'],
             function (CliExecuteEvent $e) {
                 $e->prependArg($this->userDsn);
             }
@@ -133,7 +133,7 @@ function (CliExecuteEvent $e) {
 
         $eventDispatcher->listen(
             [
-                'cli.verify.solution-execute.fail',
+                'cli.verify.reference-execute.fail',
                 'verify.finish',
                 'run.finish'
             ],

src/ExerciseRunner/CgiRunner.php

@@ -85,22 +85,24 @@ public function getName()
     private function checkRequest(RequestInterface $request, $fileName)
     {
         try {
-            $event = $this->eventDispatcher->dispatch(new CgiExecuteEvent('cgi.verify.solution-execute.pre', $request));
+            $event = $this->eventDispatcher->dispatch(
+                new CgiExecuteEvent('cgi.verify.reference-execute.pre', $request)
+            );
             $solutionResponse = $this->executePhpFile(
                 $this->exercise->getSolution()->getEntryPoint(),
                 $event->getRequest(),
-                'solution'
+                'reference'
             );
         } catch (CodeExecutionException $e) {
-            $this->eventDispatcher->dispatch(new Event('cgi.verify.solution-execute.fail', ['exception' => $e]));
+            $this->eventDispatcher->dispatch(new Event('cgi.verify.reference-execute.fail', ['exception' => $e]));
             throw new SolutionExecutionException($e->getMessage());
         }
 
         try {
-            $event = $this->eventDispatcher->dispatch(new CgiExecuteEvent('cgi.verify.user-execute.pre', $request));
-            $userResponse = $this->executePhpFile($fileName, $event->getRequest(), 'user');
+            $event = $this->eventDispatcher->dispatch(new CgiExecuteEvent('cgi.verify.student-execute.pre', $request));
+            $userResponse = $this->executePhpFile($fileName, $event->getRequest(), 'student');
         } catch (CodeExecutionException $e) {
-            $this->eventDispatcher->dispatch(new Event('cgi.verify.user-execute.fail', ['exception' => $e]));
+            $this->eventDispatcher->dispatch(new Event('cgi.verify.student-execute.fail', ['exception' => $e]));
             return Failure::fromNameAndCodeExecutionFailure($this->getName(), $e);
         }
 
@@ -215,8 +217,10 @@ public function run($fileName, OutputInterface $output)
     {
         $success = true;
         foreach ($this->exercise->getRequests() as $i => $request) {
-            $event      = $this->eventDispatcher->dispatch(new CgiExecuteEvent('cgi.run.user-execute.pre', $request));
-            $process    = $this->getProcess($fileName, $event->getRequest());
+            $event = $this->eventDispatcher->dispatch(
+                new CgiExecuteEvent('cgi.run.student-execute.pre', $request)
+            );
+            $process = $this->getProcess($fileName, $event->getRequest());
 
             $output->writeTitle("Request");
             $output->emptyLine();
@@ -225,7 +229,9 @@ public function run($fileName, OutputInterface $output)
             $output->writeTitle("Output");
             $output->emptyLine();
             $process->start();
-            $this->eventDispatcher->dispatch(new CgiExecuteEvent('cgi.run.executing', $request, ['output' => $output]));
+            $this->eventDispatcher->dispatch(
+                new CgiExecuteEvent('cgi.run.student.executing', $request, ['output' => $output])
+            );
             $process->wait(function ($outputType, $outputBuffer) use ($output) {
                 $output->write($outputBuffer);
             });

src/ExerciseRunner/CliRunner.php

@@ -97,22 +97,22 @@ public function verify($fileName)
         $args = new ArrayObject($this->exercise->getArgs());
 
         try {
-            $event = $this->eventDispatcher->dispatch(new CliExecuteEvent('cli.verify.solution-execute.pre', $args));
+            $event = $this->eventDispatcher->dispatch(new CliExecuteEvent('cli.verify.reference-execute.pre', $args));
             $solutionOutput = $this->executePhpFile(
                 $this->exercise->getSolution()->getEntryPoint(),
                 $event->getArgs(),
-                'solution'
+                'reference'
             );
         } catch (CodeExecutionException $e) {
-            $this->eventDispatcher->dispatch(new Event('cli.verify.solution-execute.fail', ['exception' => $e]));
+            $this->eventDispatcher->dispatch(new Event('cli.verify.reference-execute.fail', ['exception' => $e]));
             throw new SolutionExecutionException($e->getMessage());
         }
 
         try {
-            $event = $this->eventDispatcher->dispatch(new CliExecuteEvent('cli.verify.user-execute.pre', $args));
-            $userOutput = $this->executePhpFile($fileName, $event->getArgs(), 'user');
+            $event = $this->eventDispatcher->dispatch(new CliExecuteEvent('cli.verify.student-execute.pre', $args));
+            $userOutput = $this->executePhpFile($fileName, $event->getArgs(), 'student');
         } catch (CodeExecutionException $e) {
-            $this->eventDispatcher->dispatch(new Event('cli.verify.user-execute.fail', ['exception' => $e]));
+            $this->eventDispatcher->dispatch(new Event('cli.verify.student-execute.fail', ['exception' => $e]));
             return Failure::fromNameAndCodeExecutionFailure($this->getName(), $e);
         }
         if ($solutionOutput === $userOutput) {
@@ -131,7 +131,7 @@ public function run($fileName, OutputInterface $output)
     {
         /** @var CliExecuteEvent $event */
         $event = $this->eventDispatcher->dispatch(
-            new CliExecuteEvent('cli.run.user-execute.pre', new ArrayObject($this->exercise->getArgs()))
+            new CliExecuteEvent('cli.run.student-execute.pre', new ArrayObject($this->exercise->getArgs()))
         );
 
         $args = $event->getArgs();
@@ -147,7 +147,9 @@ public function run($fileName, OutputInterface $output)
         $output->writeTitle("Output");
         $process = $this->getPhpProcess($fileName, $args);
         $process->start();
-        $this->eventDispatcher->dispatch(new CliExecuteEvent('cli.run.executing', $args, ['output' => $output]));
+        $this->eventDispatcher->dispatch(
+            new CliExecuteEvent('cli.run.student.executing', $args, ['output' => $output])
+        );
         $process->wait(function ($outputType, $outputBuffer) use ($output) {
             $output->writeLine($outputBuffer);
         });