Switch to using PhpCallableExtension.Invoke

peachpiecompiler · Feb 15, 2025 · 6e41d1e · 6e41d1e
1 parent 2e60ced
commit 6e41d1e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/src/Peachpie.Runtime/ClrEvent.cs b/src/Peachpie.Runtime/ClrEvent.cs
@@ -100,7 +100,7 @@ public void remove(TDelegate callback)
 
         #region IPhpCallable
 
-        PhpValue IPhpCallable.Invoke(Context ctx, params ReadOnlySpan<PhpValue> arguments)
+        PhpValue IPhpCallable.Invoke(Context ctx, ReadOnlySpan<PhpValue> arguments)
         {
             //TODO: check caller, invoke EventInfo.RaiseMethod?.Invoke(Target, arguments)
             throw new NotSupportedException();

diff --git a/src/Peachpie.Runtime/PhpCallableExtension.cs b/src/Peachpie.Runtime/PhpCallableExtension.cs
@@ -6,6 +6,12 @@ namespace Pchp.Core;
 static partial class PhpCallableExtension
 {
 
+    public static PhpValue Invoke(this IPhpCallable callable, Context context)
+    {
+        Span<PhpValue> args = Array.Empty<PhpValue>();
+        return callable.Invoke(context, args);
+    }
+
     public static PhpValue Invoke(this IPhpCallable callable, Context context, PhpValue @parameter0)
     {
         var buffer = ArrayPool<PhpValue>.Shared.Rent(1);

diff --git a/src/Peachpie.Runtime/PhpCallback.cs b/src/Peachpie.Runtime/PhpCallback.cs
@@ -24,13 +24,13 @@ public interface IPhpCallable
         /// <summary>
         /// Invokes the object with given arguments.
         /// </summary>
-        PhpValue Invoke(Context ctx, params ReadOnlySpan<PhpValue> arguments) => Invoke(ctx, arguments.ToArray());
+        PhpValue Invoke(Context ctx, ReadOnlySpan<PhpValue> arguments) => Invoke(ctx, arguments.ToArray());
 
         /// <summary>
         /// Invokes the object with given arguments.
         /// </summary>
         [Obsolete("Use Invoke(Context, ReadOnlySpan<PhpValue>) instead.")]
-        PhpValue Invoke(Context ctx, params PhpValue[] arguments) => Invoke(ctx, arguments.AsSpan());
+        PhpValue Invoke(Context ctx, PhpValue[] arguments) => Invoke(ctx, arguments.AsSpan());
     }
 
     /// <summary>

diff --git a/src/Peachpie.Runtime/Reflection/PhpRoutineInfo.cs b/src/Peachpie.Runtime/Reflection/PhpRoutineInfo.cs
@@ -98,7 +98,7 @@ protected RoutineInfo(int index, string name)
 
         #region IPhpCallable
 
-        PhpValue IPhpCallable.Invoke(Context ctx, params ReadOnlySpan<PhpValue> arguments) => Invoke(ctx, Target, arguments);
+        PhpValue IPhpCallable.Invoke(Context ctx, ReadOnlySpan<PhpValue> arguments) => Invoke(ctx, Target, arguments);
 
         PhpValue IPhpCallable.ToPhpValue() => PhpValue.Null;
 

diff --git a/src/Peachpie.Runtime/std/Closure.cs b/src/Peachpie.Runtime/std/Closure.cs
@@ -188,7 +188,7 @@ public PhpValue __invoke(params ReadOnlySpan<PhpValue> parameters)
     /// <summary>
     /// Implementation of <see cref="IPhpCallable"/>, invokes the anonymous function.
     /// </summary>
-    PhpValue IPhpCallable.Invoke(Context ctx, params ReadOnlySpan<PhpValue> arguments) => __invoke(arguments);
+    PhpValue IPhpCallable.Invoke(Context ctx, ReadOnlySpan<PhpValue> arguments) => __invoke(arguments);
 
     PhpValue IPhpCallable.ToPhpValue() => PhpValue.FromClass(this);