From 305045224cb0392f4aeda2b4c94928cff663483a Mon Sep 17 00:00:00 2001
From: Aydin Hassan <aydin@hotmail.co.uk>
Date: Thu, 25 Jan 2024 23:04:10 +0100
Subject: [PATCH] Handle run/linting failures

---
 assets/components/Online/ExerciseVerify.vue |  8 +++++++-
 composer.lock                               |  8 ++++----
 src/Action/Online/RunExercise.php           | 18 +++++++++++++-----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/assets/components/Online/ExerciseVerify.vue b/assets/components/Online/ExerciseVerify.vue
index 72e57607..638f217d 100644
--- 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 whitespace-pre-wrap rounded-none border-none p-0"><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"
           >
diff --git a/composer.lock b/composer.lock
index 659ab34e..7137481d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5037,12 +5037,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-school/php-workshop.git",
-                "reference": "19d4382bfb1e7ea0eee632c3b4ab6a791c4dcdca"
+                "reference": "bf0ea93e70e45311d4e648f145e3aa9a914ac3a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-school/php-workshop/zipball/19d4382bfb1e7ea0eee632c3b4ab6a791c4dcdca",
-                "reference": "19d4382bfb1e7ea0eee632c3b4ab6a791c4dcdca",
+                "url": "https://api.github.com/repos/php-school/php-workshop/zipball/bf0ea93e70e45311d4e648f145e3aa9a914ac3a0",
+                "reference": "bf0ea93e70e45311d4e648f145e3aa9a914ac3a0",
                 "shasum": ""
             },
             "require": {
@@ -5113,7 +5113,7 @@
                 "issues": "https://github.com/php-school/php-workshop/issues",
                 "source": "https://github.com/php-school/php-workshop/tree/master"
             },
-            "time": "2023-04-20T05:15:23+00:00"
+            "time": "2024-01-25T22:02:12+00:00"
         },
         {
             "name": "php-school/php8-appreciate",
diff --git a/src/Action/Online/RunExercise.php b/src/Action/Online/RunExercise.php
index 7095b000..8c5952a0 100644
--- 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,