Make sure same hook spot is not triggered while executing

atk4 · Aug 26, 2020 · 399e43f · 399e43f
1 parent 949e5d8
commit 399e43f
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/HookTrait.php b/src/HookTrait.php
@@ -136,15 +136,13 @@ public function hook(string $spot, array $args = [], HookBreaker &$brokenBy = nu
 
         $return = [];
         if (isset($this->hooks[$spot])) {
-            krsort($this->hooks[$spot]); // lower priority is called sooner
-            $hookBackup = $this->hooks[$spot];
+            ksort($this->hooks[$spot]); // lower priority is called sooner
 
             try {
-                $bb = $this->_hookActiveSpots[$spot] ?? false;
                 $this->_hookActiveSpots[$spot] = true;
 
-                while ($_data = array_pop($this->hooks[$spot])) {
-                    foreach ($_data as $index => $data) {
+                foreach ($this->hooks[$spot] as $datas) {
+                    foreach ($datas as $index => $data) {
                         $return[$index] = $data[0](...array_merge(
                             [$this],
                             $args,
@@ -157,8 +155,7 @@ public function hook(string $spot, array $args = [], HookBreaker &$brokenBy = nu
 
                 return $e->getReturnValue();
             } finally {
-                $this->hooks[$spot] = $hookBackup;
-                $this->_hookActiveSpots[$spot] = $bb;
+                $this->_hookActiveSpots[$spot] = false;
             }
         }