Fix issue with GenericError from the inside of Task closure and updat…

…e deps
manticoresoftware · Jan 18, 2024 · 1af84b5 · 1af84b5
1 parent a8db5d1
commit 1af84b5
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 31 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Task/Task.php b/src/Task/Task.php
@@ -125,10 +125,15 @@ function (): void {
 					$this->result = $fn(...$argv);
 				} catch (Throwable $t) {
 					[$errorClass, $errorMessage] = [$t::class, $t->getMessage()];
-					$e = new GenericError("$errorClass: $errorMessage");
-					if ($errorMessage) {
-						$e->setResponseError($errorMessage);
+					if ($t instanceof GenericError) {
+						$e = $t;
+					} else {
+						$e = new GenericError("$errorClass: $errorMessage");
+						if ($errorMessage) {
+							$e->setResponseError($errorMessage);
+						}
 					}
+
 					$this->error = $e;
 				} finally {
 					$this->status = TaskStatus::Finished;

diff --git a/test/BuddyCore/Task/TaskTest.php b/test/BuddyCore/Task/TaskTest.php
@@ -100,9 +100,9 @@ function () use ($errorMessage): bool {
 		$this->assertEquals(TaskStatus::Finished, $task->getStatus());
 		$this->assertEquals(false, $task->isSucceed());
 		$error = $task->getError();
-		$this->assertEquals(true, $error instanceof GenericError);
-		$this->assertEquals(BuddyRequestError::class . ': ' . $errorMessage, $error->getMessage());
-		$this->assertEquals($errorMessage, $error->getResponseError());
+		$this->assertEquals(true, $error instanceof BuddyRequestError);
+		$this->assertEquals($errorMessage, $error->getMessage());
+		$this->assertEquals('Something went wrong', $error->getResponseError());
 	}
 
 	public function testTaskDeferredHasFLag(): void {