From 9549d7992a41ac3b3b2646063a3777a9dbde8de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Norh=C3=B8j?= Date: Tue, 26 Sep 2023 00:17:23 +0200 Subject: [PATCH 1/2] Switched from using \Exception to using \Throwable, as it is more encompassing and can catch both Error and Exception types, improving error handling. --- src/GO/FailedJob.php | 8 ++++---- src/GO/Job.php | 6 +++--- src/GO/Scheduler.php | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/GO/FailedJob.php b/src/GO/FailedJob.php index 776f825..9a6210f 100644 --- a/src/GO/FailedJob.php +++ b/src/GO/FailedJob.php @@ -1,6 +1,6 @@ job = $job; $this->exception = $exception; @@ -25,7 +25,7 @@ public function getJob(): Job return $this->job; } - public function getException(): Exception + public function getException(): Throwable { return $this->exception; } diff --git a/src/GO/Job.php b/src/GO/Job.php index b666930..d2ac096 100644 --- a/src/GO/Job.php +++ b/src/GO/Job.php @@ -1,8 +1,8 @@ args); - } catch (Exception $e) { + } catch (Throwable $e) { ob_end_clean(); throw $e; } diff --git a/src/GO/Scheduler.php b/src/GO/Scheduler.php index 8e4a439..4d31eea 100644 --- a/src/GO/Scheduler.php +++ b/src/GO/Scheduler.php @@ -1,7 +1,7 @@ run(); $this->pushExecutedJob($job); - } catch (\Exception $e) { + } catch (Throwable $e) { $this->pushFailedJob($job, $e); } } @@ -251,10 +251,10 @@ public function getExecutedJobs() * Push a failed job. * * @param Job $job - * @param Exception $e + * @param Throwable $e * @return Job */ - private function pushFailedJob(Job $job, Exception $e) + private function pushFailedJob(Job $job, Throwable $e) { $this->failedJobs[] = new FailedJob($job, $e); From 9cae7b9eeb37e5946755baacd03037a3606b61c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Norh=C3=B8j?= Date: Tue, 26 Sep 2023 00:21:48 +0200 Subject: [PATCH 2/2] Reordered use statements in Job.php, to satisfy code guidelines --- src/GO/Job.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GO/Job.php b/src/GO/Job.php index d2ac096..97e99be 100644 --- a/src/GO/Job.php +++ b/src/GO/Job.php @@ -1,8 +1,8 @@