refactor(middleware): improvements on error handling

src/Middleware/AbstractMiddlewareStack.php

@@ -62,16 +62,16 @@ protected function runMiddleware(MiddlewareRegistryInterface $middlewareList, Cl
 
                 $this->executedMiddleware->attach(object: $middleware);
             });
-        } catch (Throwable $throwable) {
+        } catch (Throwable) {
+            $middlewareList->next();
+        } finally {
             foreach ($requiredMiddlewareList as $singleRequiredMiddlewareList) {
                 if ($this->executedMiddleware->contains(object: $singleRequiredMiddlewareList)) {
                     continue;
                 }
 
                 $func($singleRequiredMiddlewareList);
             }
-
-            throw $throwable;
         }
     }
 

src/Middleware/MiddlewareRegistry.php

@@ -13,6 +13,7 @@
 use function is_array;
 use function iterator_to_array;
 use function uasort;
+use function next;
 
 use const ARRAY_FILTER_USE_BOTH;
 
@@ -73,6 +74,14 @@ public function toArray(): array
         return $this->middlewareList;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function next(): void
+    {
+        next(array: $this->middlewareList);
+    }
+
     /**
      * {@inheritdoc}
      */

src/Middleware/MiddlewareRegistryInterface.php

@@ -44,6 +44,11 @@ public function walk(Closure $func): MiddlewareRegistryInterface;
      */
     public function uasort(Closure $func): MiddlewareRegistryInterface;
 
+    /**
+     * Change the internal cursor of the middleware list, mainly used by {@see AbstractMiddlewareStack::runMiddleware()} to iterate over the list when an exception is thrown.
+     */
+    public function next(): void;
+
     /**
      * @return array<int, PostExecutionMiddlewareInterface|PreExecutionMiddlewareInterface|PreSchedulingMiddlewareInterface|PostSchedulingMiddlewareInterface|RequiredMiddlewareInterface|OrderedMiddlewareInterface>
      */

src/Worker/Worker.php

@@ -292,7 +292,10 @@ protected function handleTask(TaskInterface $task, TaskListInterface $taskList):
 
                 $this->taskExecutionTracker->endTracking(task: $task);
                 $task->setExecutionEndTime(dateTimeImmutable: new DateTimeImmutable());
+                $task->setLastExecution(dateTimeImmutable: new DateTimeImmutable());
                 $this->defineTaskExecutionState(task: $task, output: $output);
+
+                $this->middlewareStack->runPostExecutionMiddleware(task: $task, worker: $this);
                 $this->eventDispatcher->dispatch(new TaskExecutedEvent(task: $task, output: $output));
                 $this->configuration->setLastExecutedTask(lastExecutedTask: $task);
 
@@ -304,12 +307,9 @@ protected function handleTask(TaskInterface $task, TaskListInterface $taskList):
             $this->getFailedTasks()->add(task: $failedTask);
             $this->eventDispatcher->dispatch(event: new TaskFailedEvent(task: $failedTask));
         } finally {
-            $task->setLastExecution(dateTimeImmutable: new DateTimeImmutable());
-
             $this->configuration->setCurrentlyExecutedTask(task: null);
             $this->configuration->run(isRunning: false);
 
-            $this->middlewareStack->runPostExecutionMiddleware(task: $task, worker: $this);
             $this->eventDispatcher->dispatch(event: new WorkerRunningEvent(worker: $this, isIdle: true));
         }
     }

tests/Middleware/WorkerMiddlewareStackTest.php

@@ -9,6 +9,7 @@
 use SchedulerBundle\Middleware\PostExecutionMiddlewareInterface;
 use SchedulerBundle\Middleware\PreExecutionMiddlewareInterface;
 use SchedulerBundle\Middleware\WorkerMiddlewareStack;
+use SchedulerBundle\Task\NullTask;
 use SchedulerBundle\Task\TaskInterface;
 use SchedulerBundle\Worker\WorkerInterface;
 use Throwable;
@@ -23,7 +24,7 @@ final class WorkerMiddlewareStackTest extends TestCase
      */
     public function testStackCanRunEmptyPreMiddlewareList(): void
     {
-        $task = $this->createMock(TaskInterface::class);
+        $task = new NullTask(name: 'foo');
 
         $middleware = $this->createMock(PostExecutionMiddlewareInterface::class);
         $middleware->expects(self::never())->method('postExecute')->with($task);
@@ -40,7 +41,7 @@ public function testStackCanRunEmptyPreMiddlewareList(): void
      */
     public function testStackCanRunPreMiddlewareList(): void
     {
-        $task = $this->createMock(TaskInterface::class);
+        $task = new NullTask(name: 'foo');
 
         $middleware = $this->createMock(PreExecutionMiddlewareInterface::class);
         $middleware->expects(self::once())->method('preExecute')->with($task);
@@ -62,7 +63,7 @@ public function testStackCanRunPreMiddlewareList(): void
     public function testStackCanRunEmptyPostMiddlewareList(): void
     {
         $worker = $this->createMock(WorkerInterface::class);
-        $task = $this->createMock(TaskInterface::class);
+        $task = new NullTask(name: 'foo');
 
         $middleware = $this->createMock(PreExecutionMiddlewareInterface::class);
         $middleware->expects(self::never())->method('preExecute')->with($task);

tests/Worker/ExecutionPolicy/ExecutionPolicyRegistryTest.php

@@ -16,14 +16,14 @@ final class ExecutionPolicyRegistryTest extends TestCase
 {
     public function testRegistryCanCount(): void
     {
-        $registry = new ExecutionPolicyRegistry([]);
+        $registry = new ExecutionPolicyRegistry(policies: []);
 
         self::assertCount(0, $registry);
     }
 
     public function testRegistryCannotReturnInvalidPolicy(): void
     {
-        $registry = new ExecutionPolicyRegistry([
+        $registry = new ExecutionPolicyRegistry(policies: [
             new DefaultPolicy(),
         ]);
         self::assertCount(1, $registry);
@@ -36,7 +36,7 @@ public function testRegistryCannotReturnInvalidPolicy(): void
 
     public function testRegistryCannotReturnMultiplePolicies(): void
     {
-        $registry = new ExecutionPolicyRegistry([
+        $registry = new ExecutionPolicyRegistry(policies: [
             new DefaultPolicy(),
             new DefaultPolicy(),
         ]);
@@ -50,12 +50,12 @@ public function testRegistryCannotReturnMultiplePolicies(): void
 
     public function testRegistryCanReturnPolicy(): void
     {
-        $registry = new ExecutionPolicyRegistry([
+        $registry = new ExecutionPolicyRegistry(policies: [
             new DefaultPolicy(),
         ]);
         self::assertCount(1, $registry);
 
-        $policy = $registry->find('default');
+        $policy = $registry->find(policy: 'default');
         self::assertInstanceOf(DefaultPolicy::class, $policy);
     }
 }

tests/Worker/WorkerTest.php

@@ -1367,7 +1367,7 @@ public function testWorkerCanRetrieveTasksLazily(): void
         ]), $eventDispatcher, $lockFactory, $logger);
 
         $configuration = WorkerConfiguration::create();
-        $configuration->mustRetrieveTasksLazily(true);
+        $configuration->mustRetrieveTasksLazily(mustRetrieveTasksLazily: true);
 
         $worker->execute($configuration);