Merge pull request #164 from radiate-framework/bugfix/route-parameters

added route parameters back into route and request

Author: BenRutlandWeb

src/Http/Request.php

@@ -38,6 +38,13 @@ class Request extends WP_REST_Request implements Arrayable, Jsonable, JsonSerial
      */
     protected $userResolver;
 
+    /**
+     * The route resolver
+     *
+     * @var \Closure
+     */
+    protected $routeResolver;
+
     /**
      * Create the request instance
      *
@@ -94,6 +101,7 @@ public static function createFrom(self $from, ?Request $to = null)
         $request->set_cookie_params($from->get_cookie_params());
         $request->set_server_params($from->get_server_params());
         $request->setUserResolver($from->getUserResolver());
+        $request->setRouteResolver($from->getRouteResolver());
 
         return $request;
     }
@@ -196,19 +204,46 @@ public function get_cookie_params(): array
     }
 
     /**
-     * Get the request route parameters
+     * Get the request route
      *
-     * @param string|null $key
+     * @param string|null $parameters
      * @param mixed|null $default
-     * @return mixed
+     * @return \Radiate\Routing\Route|mixed
      */
-    public function route(?string $key = null, $default = null)
+    public function route(?string $parameter = null, $default = null)
     {
-        if ($key) {
-            return $this->get_url_params()[$key] ?? $default;
+        $route = call_user_func($this->getRouteResolver());
+
+        if (is_null($route) || is_null($parameter)) {
+            return $route;
         }
 
-        return $this->get_url_params();
+        return $route->parameter($parameter, $default);
+    }
+
+    /**
+     * Set the route resolver
+     *
+     * @param \Closure $resolver
+     * @return self
+     */
+    public function setRouteResolver(Closure $resolver)
+    {
+        $this->routeResolver = $resolver;
+
+        return $this;
+    }
+
+    /**
+     * Get the route resolver
+     *
+     * @return \Closure
+     */
+    public function getRouteResolver()
+    {
+        return $this->routeResolver ?: function () {
+            //
+        };
     }
 
     /**

src/Routing/AjaxRoute.php

@@ -31,6 +31,10 @@ public function dispatch(Request $request)
     public function handle(Request $request)
     {
         return function () use ($request) {
+            $request->setRouteResolver(function () {
+                return $this;
+            });
+
             $response = $this->runRequestThroughStack($request);
 
             static::toResponse($response)->send();

src/Routing/RestRoute.php

@@ -33,7 +33,12 @@ public function dispatch(Request $request)
     public function handle(Request $request)
     {
         return function (WP_REST_Request $wpRequest) {
-            $request = Request::createFromBase($wpRequest);
+            $request = Request::createFromBase($wpRequest)
+                ->setRouteResolver(function () {
+                    return $this;
+                });
+
+            $this->parameters = $request->get_url_params();
 
             $response = $this->runRequestThroughStack($request);
 

src/Routing/Route.php

@@ -67,6 +67,13 @@ abstract class Route
      */
     protected $attributes;
 
+    /**
+     * The route parameters
+     *
+     * @var array
+     */
+    protected $parameters = [];
+
     /**
      * Create the route instance
      *
@@ -267,7 +274,7 @@ protected function runRequestThroughStack(Request $request)
                 ->then(function ($request) {
                     $this->app->instance('request', $request);
 
-                    return $this->app->call($this->action());
+                    return $this->app->call($this->action(), $this->parameters());
                 });
         } catch (Throwable $e) {
             $response = $this->app->renderException($request, $e);
@@ -338,6 +345,40 @@ protected function gatherMiddleware()
         return array_unique($middleware);
     }
 
+    /**
+     * Get the route parameters
+     *
+     * @return array
+     */
+    public function parameters()
+    {
+        return $this->parameters;
+    }
+
+    /**
+     * Get a route parameter
+     *
+     * @param string $key
+     * @param mixed|null $default
+     * @return mixed
+     */
+    public function parameter(string $key, $default = null)
+    {
+        return $this->parameters[$key] ?? $default;
+    }
+
+    /**
+     * Set a parameter
+     *
+     * @param string $key
+     * @param mixed $value
+     * @return void
+     */
+    public function setParameter(string $key, $value)
+    {
+        $this->parameters[$key] = $value;
+    }
+
     /**
      * Dispatch the request to the route
      *