fix function order params

Author: optimistex

Expression.lib.php

@@ -498,7 +498,7 @@ function pfx($tokens, $vars = array())
                         }
                         $args[] = $stack->pop();
                     }
-                    $stack->push($reflection->invokeArgs($args));
+                    $stack->push($reflection->invokeArgs(array_reverse($args)));
                 }
                 // if the token is a number or variable, push it on the stack
             } else {

composer.json

@@ -2,7 +2,7 @@
   "name": "optimistex/yii2-expression",
   "description": "Taken from http://www.phpclasses.org/browse/file/11680.html, cred to Miles Kaufmann",
   "type": "yii2-extension",
-  "version": "2.0.1.2",
+  "version": "2.0.1.3",
   "license": "MIT",
   "authors": [
     {

tests/Expression.php

@@ -301,6 +301,41 @@ public function testBug_1()
     // */
 
     public function testFormulaWithBrackets()
+    {
+        $e = new Expression();
+        $e->suppress_errors = true;
+        $e->functions = [
+            'p1' => function ($p1, $p2, $p3, $p4, $p5) {
+                return $p1;
+            },
+            'p2' => function ($p1, $p2, $p3, $p4, $p5) {
+                return $p2;
+            },
+            'p3' => function ($p1, $p2, $p3, $p4, $p5) {
+                return $p3;
+            },
+            'p4' => function ($p1, $p2, $p3, $p4, $p5) {
+                return $p4;
+            },
+            'p5' => function ($p1, $p2, $p3, $p4, $p5) {
+                return $p5;
+            },
+        ];
+
+        $data = [
+            'p1(1, 2, 3, 4, 5)' => 1,
+            'p2(1, 2, 3, 4, 5)' => 2,
+            'p3(1, 2, 3, 4, 5)' => 3,
+            'p4(1, 2, 3, 4, 5)' => 4,
+            'p5(1, 2, 3, 4, 5)' => 5,
+        ];
+
+        foreach ($data as $formula => $result) {
+            $this->assertEquals($e->evaluate($formula), $result);
+        }
+    }
+
+    public function testFunctionOrderParameters()
     {
         $e = new Expression();
         $e->suppress_errors = true;
@@ -312,7 +347,6 @@ public function testFormulaWithBrackets()
                 return max($v1, $v2);
             },
         ];
-//        $formula = 'max(2,(2+2)*2)';
 
         $data = [
             'max(2,(2+2)*2)' => 8,
@@ -334,4 +368,5 @@ public function testFormulaWithBrackets()
             $this->assertEquals($e->evaluate($formula), $result);
         }
     }
+
 }