Handle run/linting failures

php-school · Jan 25, 2024 · a220a95 · a220a95
1 parent 753841d
commit a220a95
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/assets/components/Online/ExerciseVerify.vue b/assets/components/Online/ExerciseVerify.vue
@@ -168,7 +168,12 @@ const verifySolution = () => {
       </template>
       <template #body>
         <div class="">
-          <TabGroup v-if="programRunResult && programRunResult.runs.length > 1">
+          <template v-if="programRunResult && programRunResult.success === false">
+            <h2 class="mb-2 pt-0 font-mono text-lg text-[#E91E63]">Your program could not be executed, there was a syntax error</h2>
+            <pre class="mb-4 rounded-none border-none p-0 whitespace-pre-wrap"><code class="language-shell hljs shell  block rounded-lg p-4 text-sm">{{programRunResult.failure.reason}}</code></pre>
+          </template>
+
+          <TabGroup v-else-if="programRunResult && programRunResult.runs.length > 1">
             <TabList className="flex justify-center border-b border-solid border-gray-600">
               <Tab as="template" v-slot="{ selected }" v-for="(run, i) in programRunResult.runs" :key="i">
                 <button
@@ -195,6 +200,7 @@ const verifySolution = () => {
         <div class="flex justify-end">
           <button
             type="button"
+            v-show="programRunResult.success === true"
             class="inline-flex w-full items-center justify-center rounded-full border border-transparent bg-pink-600 px-8 py-2 text-base font-medium text-white shadow-sm hover:bg-pink-700 focus:outline-none focus:ring focus:ring-pink-800 sm:ml-3 sm:w-auto sm:text-sm"
             @click="runSolution"
           >
@@ -205,4 +211,4 @@ const verifySolution = () => {
       </template>
     </Modal>
   </Transition>
-</template>
+</template>
diff --git a/composer.lock b/composer.lock
diff --git a/src/Action/Online/RunExercise.php b/src/Action/Online/RunExercise.php
@@ -5,6 +5,7 @@
 use PhpSchool\PhpWorkshop\Event\CgiExecuteEvent;
 use PhpSchool\PhpWorkshop\Event\CliExecuteEvent;
 use PhpSchool\PhpWorkshop\Event\Event;
+use PhpSchool\PhpWorkshop\Exception\CouldNotRunException;
 use PhpSchool\PhpWorkshop\Input\Input;
 use PhpSchool\PhpWorkshop\Output\BufferedOutput;
 use PhpSchool\Website\Action\JsonUtils;
@@ -60,12 +61,19 @@ public function __invoke(
                 $this->collectRunInfo($event, $output);
             });
 
-        $result = $workshop->getExerciseDispatcher()->run(
-            $exercise,
-            new Input($workshop->getCode(), ['program' => $project->getEntryPoint()->getAbsolutePath()]),
-            $output
-        );
 
+        try {
+            $result = $workshop->getExerciseDispatcher()->run(
+                $exercise,
+                new Input($workshop->getCode(), ['program' => $project->getEntryPoint()->getAbsolutePath()]),
+                $output
+            );
+        } catch (CouldNotRunException $e) {
+            return $this->withJson([
+                'success' => false,
+                'failure' => $e->getFailure()->toArray(),
+            ], $response);
+        }
 
         $data = [
             'runs' => $this->runInfo,