Throw an IncorrectNumberOfFunctionParametersException if a function g…

…ets more arguments than it supports (#117) * Throw an IncorrectNumberOfFunctionParametersException if a function gets more arguments than it supports * Update CustomFunction.php Code Style Co-authored-by: Bruce Wells <[email protected]>
neonxp · Aug 4, 2022 · 9538001 · 9538001
1 parent 08b432e
commit 9538001
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/NXP/Classes/CustomFunction.php b/src/NXP/Classes/CustomFunction.php
@@ -15,6 +15,8 @@ class CustomFunction
      */
     public $function;
 
+    private bool $isVariadic;
+    private int $totalParamCount;
     private int $requiredParamCount;
 
     /**
@@ -26,7 +28,10 @@ public function __construct(string $name, callable $function)
     {
         $this->name = $name;
         $this->function = $function;
-        $this->requiredParamCount = (new ReflectionFunction($function))->getNumberOfRequiredParameters();
+        $reflection = (new ReflectionFunction($function));
+        $this->isVariadic = $reflection->isVariadic();
+        $this->totalParamCount = $reflection->getNumberOfParameters();
+        $this->requiredParamCount = $reflection->getNumberOfRequiredParameters();
 
     }
 
@@ -40,6 +45,9 @@ public function execute(array &$stack, int $paramCountInStack) : Token
         if ($paramCountInStack < $this->requiredParamCount) {
             throw new IncorrectNumberOfFunctionParametersException($this->name);
         }
+        if ($paramCountInStack > $this->totalParamCount && ! $this->isVariadic) {
+            throw new IncorrectNumberOfFunctionParametersException($this->name);
+        }
         $args = [];
 
         if ($paramCountInStack > 0) {

diff --git a/tests/MathTest.php b/tests/MathTest.php
@@ -674,6 +674,16 @@ public function testFunctionIncorrectNumberOfParameters() : void
         $calculator->execute('myfunc(1)');
     }
 
+    public function testFunctionIncorrectNumberOfParametersTooMany() : void
+    {
+        $calculator = new MathExecutor();
+        $this->expectException(IncorrectNumberOfFunctionParametersException::class);
+        $calculator->addFunction('myfunc', static function($arg1, $arg2) {
+            return $arg1 + $arg2;
+        });
+        $calculator->execute('myfunc(1,2,3)');
+    }
+
     public function testFunctionIf() : void
     {
         $calculator = new MathExecutor();