Fixup patching events in case of exceptions

Author: mikeymike

app/config.php

@@ -387,31 +387,16 @@ function (CgiResult $result) use ($c) {
             'application.tear-down' => [
                 containerListener(CodePatchListener::class, 'revert'),
             ],
-            'verify.post.exception' => [
-                containerListener(CodePatchListener::class, 'revert'),
-            ],
-            'cli.verify.start' => [
-                containerListener(CodePatchListener::class, 'patch'),
-            ],
-            'cli.verify.finish' => [
-                containerListener(CodePatchListener::class, 'revert'),
-            ],
-            'cli.run.start' => [
+            'verify.pre.execute' => [
                 containerListener(CodePatchListener::class, 'patch'),
             ],
-            'cli.run.finish' => [
+            'verify.post.execute' => [
                 containerListener(CodePatchListener::class, 'revert'),
             ],
-            'cgi.verify.start' => [
-                containerListener(CodePatchListener::class, 'patch'),
-            ],
-            'cgi.verify.finish' => [
-                containerListener(CodePatchListener::class, 'revert'),
-            ],
-            'cgi.run.start' => [
+            'run.start' => [
                 containerListener(CodePatchListener::class, 'patch'),
             ],
-            'cgi.run.finish' => [
+            'run.finish' => [
                 containerListener(CodePatchListener::class, 'revert'),
             ],
         ],

src/Application.php

@@ -86,8 +86,6 @@ public function __construct(string $workshopTitle, string $diConfigFile)
 
         $this->workshopTitle = $workshopTitle;
         $this->diConfigFile = $diConfigFile;
-
-        set_error_handler([$this, 'handleInternalError']);
     }
 
     /**
@@ -196,17 +194,13 @@ public function configure(): ContainerInterface
             }
         }
 
-        $tearDown = function () use ($container): bool {
-            // TODO: This works.. but wrong event as PatchListener take ExerciseRunnerEvent
+        set_error_handler(function () use ($container): bool {
             $container
                 ->get(EventDispatcher::class)
                 ->dispatch(new Event('application.tear-down'));
 
-            // Fallback to default error handler
-            return false;
-        };
-
-        set_error_handler($tearDown);
+            return false; // Use default error handler
+        });
 
         return $container;
     }
@@ -288,16 +282,4 @@ private function getContainer(): Container
 
         return $containerBuilder->build();
     }
-
-    private function handleInternalError(
-        int $errno,
-        string $errstr,
-        string $errfile,
-        int $errline
-    ): bool {
-
-
-
-        return false;
-    }
 }

src/ExerciseDispatcher.php

@@ -151,9 +151,6 @@ public function verify(ExerciseInterface $exercise, Input $input): ResultAggrega
 
         try {
             $this->results->add($runner->verify($input));
-        } catch (\Throwable $e) {
-            $this->eventDispatcher->dispatch(new ExerciseRunnerEvent('verify.post.exception', $exercise, $input));
-            throw $e;
         } finally {
             $this->eventDispatcher->dispatch(new ExerciseRunnerEvent('verify.post.execute', $exercise, $input));
         }

src/Listener/CodePatchListener.php

@@ -47,11 +47,7 @@ public function patch(ExerciseRunnerEvent $event): void
             $files[] = $exercise->getSolution()->getEntryPoint();
         }
 
-        foreach ($files as $fileName) {
-            if (null === $fileName) {
-                return;
-            }
-
+        foreach (array_filter($files) as $fileName) {
             $this->originalCode[$fileName] = (string) file_get_contents($fileName);
 
             file_put_contents(

src/Listener/InMemorySolutionListener.php

@@ -66,7 +66,7 @@ public static function fromSolution(SolutionInterface $solution)
     }
 
     /**
-     * Get the entry point. This is the PHP file that PHO would execute in order to run the
+     * Get the entry point. This is the PHP file that PHP would execute in order to run the
      * program. This should be the absolute path.
      *
      * @return string