Merge pull request #87 from utopia-php/feat-allow-error-overrides

Allow overriding the error resource from group to global hook
utopia-php · Jan 29, 2023 · b8d0447 · b8d0447
2 parents e8da557 + 784cb4f
commit b8d0447
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/App.php b/src/App.php
@@ -599,11 +599,12 @@ public function execute(Route $route, Request $request): static
                 }
             }
         } catch (\Throwable $e) {
+            self::setResource('error', fn () => $e);
+
             foreach ($groups as $group) {
                 foreach (self::$errors as $error) { // Group error hooks
                     /** @var Hook $error */
                     if (in_array($group, $error->getGroups())) {
-                        self::setResource('error', fn () => $e);
                         try {
                             $arguments = $this->getArguments($error, $values, $request->getParams());
                             \call_user_func_array($error->getAction(), $arguments);
@@ -617,7 +618,6 @@ public function execute(Route $route, Request $request): static
             foreach (self::$errors as $error) { // Global error hooks
                 /** @var Hook $error */
                 if (in_array('*', $error->getGroups())) {
-                    self::setResource('error', fn () => $e);
                     try {
                         $arguments = $this->getArguments($error, $values, $request->getParams());
                         \call_user_func_array($error->getAction(), $arguments);