Dispatch BeforeExecute and AfterExecute events in catchToExecute meth…

…od. (#6252)

CHANGELOG-3.0.md

@@ -3,7 +3,7 @@
 ## Added
 
 - [#6236](https://github.com/hyperf/hyperf/pull/6236) Support unionType param for GenerateModelIDEVisitor.
-- [#6246](https://github.com/hyperf/hyperf/pull/6246) Added crontab lifecycle events.
+- [#6246](https://github.com/hyperf/hyperf/pull/6246) [#6252](https://github.com/hyperf/hyperf/pull/6252) Added crontab lifecycle events.
 - [#6249](https://github.com/hyperf/hyperf/pull/6249) Support crontab closure type.
 
 ## Optimized

src/crontab/src/Event/Event.php

@@ -12,16 +12,10 @@
 namespace Hyperf\Crontab\Event;
 
 use Hyperf\Crontab\Crontab;
-use Throwable;
 
 abstract class Event
 {
-    public function __construct(public Crontab $crontab, public ?Throwable $throwable = null)
+    public function __construct(public Crontab $crontab)
     {
     }
-
-    public function getThrowable(): ?Throwable
-    {
-        return $this->throwable;
-    }
 }

src/crontab/src/Event/FailToExecute.php

@@ -11,6 +11,18 @@
  */
 namespace Hyperf\Crontab\Event;
 
+use Hyperf\Crontab\Crontab;
+use Throwable;
+
 class FailToExecute extends Event
 {
+    public function __construct(Crontab $crontab, public Throwable $throwable)
+    {
+        parent::__construct($crontab);
+    }
+
+    public function getThrowable(): Throwable
+    {
+        return $this->throwable;
+    }
 }

src/crontab/src/Strategy/Executor.php

@@ -190,15 +190,15 @@ protected function decorateRunnable(Crontab $crontab, Closure $runnable): Closur
     protected function catchToExecute(Crontab $crontab, Closure $runnable): Closure
     {
         return function () use ($crontab, $runnable) {
-            $this->dispatcher?->dispatch(new BeforeExecute($crontab));
             try {
+                $this->dispatcher?->dispatch(new BeforeExecute($crontab));
                 $result = true;
                 $runnable();
+                $this->dispatcher?->dispatch(new AfterExecute($crontab));
             } catch (Throwable $throwable) {
                 $result = false;
                 $this->dispatcher?->dispatch(new FailToExecute($crontab, $throwable));
             } finally {
-                $this->dispatcher?->dispatch(new AfterExecute($crontab, $throwable ?? null));
                 $this->logResult($crontab, $result, $throwable ?? null);
             }
         };