Splat operator doesn't like associative arrays.

Fixes #10286
cakephp · Feb 22, 2017 · 97cbe23 · 97cbe23
1 parent 39ec5b7
commit 97cbe23
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
@@ -437,7 +437,7 @@ public function invokeAction()
         /* @var callable $callable */
         $callable = [$this, $request->getParam('action')];
 
-        return $callable(...$request->getParam('pass'));
+        return $callable(...array_values($request->getParam('pass')));
     }
 
     /**

diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
@@ -872,6 +872,29 @@ public function testInvokeActionReturnValue()
         $this->assertEquals('I am from the controller.', $result);
     }
 
+    /**
+     * test invoking controller methods with passed params
+     *
+     * @return void
+     */
+    public function testInvokeActionWithPassedParams()
+    {
+        $url = new Request('test/index/1/2');
+        $url->addParams([
+            'controller' => 'Test',
+            'action' => 'index',
+            'pass' => ['param1' => '1', 'param2' => '2']
+        ]);
+        $response = $this->getMockBuilder('Cake\Network\Response')->getMock();
+
+        $Controller = new TestController($url, $response);
+        $result = $Controller->invokeAction();
+        $this->assertEquals(
+            ['testId' => '1', 'test2Id' => '2'],
+            $Controller->request->data
+        );
+    }
+
     /**
      * test that a classes namespace is used in the viewPath.
      *