Added helper metjpd fireCallback to XmlNodeList

horstoeko · Aug 28, 2024 · 519b7b6 · 519b7b6
1 parent 8e8b768
commit 519b7b6
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/src/xml/XmlNodeList.php b/src/xml/XmlNodeList.php
@@ -82,13 +82,7 @@ public function forEachMax(int $max, $callback, $callBackBefore = null, $callbac
             return;
         }
 
-        if (!is_callable($callback)) {
-            return;
-        }
-
-        if (is_callable($callBackBefore)) {
-            call_user_func($callBackBefore);
-        }
+        $this->fireCallback($callBackBefore);
 
         $count = 0;
 
@@ -99,19 +93,27 @@ public function forEachMax(int $max, $callback, $callBackBefore = null, $callbac
                 break;
             }
 
-            if (is_callable($callbackBeforeEach)) {
-                call_user_func($callbackBeforeEach, $node);
-            }
+            $this->fireCallback($callbackBeforeEach, $node);
+            $this->fireCallback($callback, $node);
+            $this->fireCallback($callbackAfterEach, $node);
+        }
 
-            call_user_func($callback, $node);
+        $this->fireCallback($callbackAfter);
+    }
 
-            if (is_callable($callbackAfterEach)) {
-                call_user_func($callbackAfterEach, $node);
-            }
+    /**
+     * Internal helper function to fire a callback function
+     *
+     * @param  callable $callback
+     * @param  array    ...$args
+     * @return void
+     */
+    private function fireCallback($callback, ...$args)
+    {
+        if (!is_callable($callback)) {
+            return;
         }
 
-        if (is_callable($callbackAfter)) {
-            call_user_func($callbackAfter);
-        }
+        call_user_func($callback, ...$args);
     }
 }