Renumbering argument array before unpacking to controller method.

src/ControllerParams.php

@@ -18,6 +18,9 @@
  */
 class ControllerParams
 {
+    /** @var string URI that was matched to the route */
+    public $route;
+
     /** @var string Controller class to call */
     public $className; 
 
@@ -30,8 +33,9 @@ class ControllerParams
     /** @var Psr\Container\ContainerInterface Container to pass to constructor */
     public $container;
 
-    public function __construct($class, $method, $args, Container $container)
+    public function __construct($route, $class, $method, $args, Container $container)
     {
+        $this->route = $route;
         $this->className = $class;
         $this->method = $method;
         $this->args = $args;

src/HandlerContainer.php

@@ -68,11 +68,10 @@ public function addMiddleware(array $stack)
      */
     public function startProcessing(Router $router, Request $request, $uri, $args) : Response
     {
-        $params = new ControllerParams($this->controllerClass, $this->controllerMethod, $args, $router->getServiceContainer());
+        $params = new ControllerParams($uri, $this->controllerClass, $this->controllerMethod, $args, $router->getServiceContainer());
 
         $request->attributes->set('controller', $params);
         $request->attributes->set('router', $router);
-        $request->attributes->set('route', $uri);
         return $this->process($request);
     }
 
@@ -102,7 +101,7 @@ public function process(Request $request) : Response
 
             // Call controller with request and args
             $router->log("Router: Calling Controller: %s@%s", $params->className, $params->method);
-            $return = (new $params->className($params->container))->{$params->method}($request, ...$params->args);
+            $return = (new $params->className($params->container))->{$params->method}($request, ...array_values($params->args));
             $router->log("Router: Controller Left");
 
             // Instantly return Response objects