Merge pull request #3 from cgauge/abdala-patch-1

Throw exception after rollback
cgauge · Jun 19, 2023 · 6b93be7 · 6b93be7
2 parents a4a062f + e136dad
commit 6b93be7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Strategy/RollbackOnFailure.php b/src/Strategy/RollbackOnFailure.php
@@ -47,8 +47,10 @@ public function execute(callable $callback, array $context = []): void
             $task = $callback();
 
             array_unshift($this->executed, $task);
-        } catch (Throwable) {
+        } catch (Throwable $e) {
             $this->rollback();
+
+            throw $e;
         }
     }
 
@@ -59,7 +61,10 @@ public function rollback(): void
         });
 
         foreach ($tasks as $task) {
-            $task->reverse($this->context);
+            try {
+                $task->reverse($this->context);
+            } catch (Throwable) {
+            }
         }
     }
 }
diff --git a/tests/Strategy/RollbackOnFailureTest.php b/tests/Strategy/RollbackOnFailureTest.php
@@ -43,7 +43,7 @@ public function test_it_rollback_when_a_task_fail(): void
             ->method('reverse');
 
         $createFolder->method('run')
-            ->willThrowException(new Exception());
+            ->willThrowException(new CreateFolderException());
 
         $strategy = new RollbackOnFailure();
 
@@ -53,12 +53,18 @@ public function test_it_rollback_when_a_task_fail(): void
             return $createEmail;
         });
 
+        $this->expectException(CreateFolderException::class);
+
         $strategy->execute(static function () use ($createFolder): void {
             $createFolder->run([]);
         });
     }
 }
 
+class CreateFolderException extends Exception
+{
+}
+
 interface ReversibleTask extends Task, Reversible
 {
 }