TASK: Pass arguments to EelInvocationTracerInterface and also trace…

… function calls
neos · Aug 19, 2024 · 13ccf72 · 13ccf72
1 parent ee1266d
commit 13ccf72
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/Neos.Eel/Classes/Context.php b/Neos.Eel/Classes/Context.php
@@ -94,7 +94,6 @@ public function call($method, array $arguments = [])
         if ($this->value === null) {
             return null;
         } elseif (is_object($this->value)) {
-            $this->tracer?->recordMethodCall($this->value, $method);
             $callback = [$this->value, $method];
         } elseif (is_array($this->value)) {
             if (!array_key_exists($method, $this->value)) {
@@ -113,6 +112,14 @@ public function call($method, array $arguments = [])
                 $arguments[$i] = $arguments[$i]->unwrap();
             }
         }
+        if ($this->tracer !== null) {
+            // optional experimental tracing
+            if (is_object($this->value)) {
+                $this->tracer->recordMethodCall($this->value, $method, $arguments);
+            } else {
+                $this->tracer->recordFunctionCall($callback, $method, $arguments);
+            }
+        }
         return call_user_func_array($callback, $arguments);
     }
 

diff --git a/Neos.Eel/Classes/EelInvocationTracerInterface.php b/Neos.Eel/Classes/EelInvocationTracerInterface.php
@@ -9,5 +9,13 @@ interface EelInvocationTracerInterface
 {
     public function recordPropertyAccess(object $object, string $propertyName): void;
 
-    public function recordMethodCall(object $object, string $methodName): void;
+    /**
+     * @param array<int, mixed> $arguments
+     */
+    public function recordMethodCall(object $object, string $methodName, array $arguments): void;
+
+    /**
+     * @param array<int, mixed> $arguments
+     */
+    public function recordFunctionCall(callable $function, string $functionName, array $arguments): void;
 }