Lumen does not support a) setting default parameters for a route, b) …

…limiting routes by certain regexp
jelhan · May 24, 2017 · c49adf8 · c49adf8
1 parent 9151004
commit c49adf8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 24 deletions.
diff --git a/src/Routing/ApiGroup.php b/src/Routing/ApiGroup.php
@@ -20,8 +20,8 @@
 
 use CloudCreativity\LaravelJsonApi\Api\ApiResource;
 use CloudCreativity\LaravelJsonApi\Api\Definition;
-use Illuminate\Contracts\Routing\Registrar;
 use Illuminate\Support\Fluent;
+use Laravel\Lumen\Application;
 
 /**
  * Class ApiGroup
@@ -53,7 +53,7 @@ class ApiGroup
      * @param Definition $apiDefinition
      * @param array $options
      */
-    public function __construct(Registrar $router, Definition $apiDefinition, array $options)
+    public function __construct(Application $router, Definition $apiDefinition, array $options)
     {
         $this->router = $router;
         $this->apiDefinition = $apiDefinition;

diff --git a/src/Routing/RegistersResources.php b/src/Routing/RegistersResources.php
@@ -20,9 +20,9 @@
 
 use ArrayAccess;
 use CloudCreativity\JsonApi\Utils\Str;
-use Illuminate\Contracts\Routing\Registrar;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Fluent;
+use Laravel\Lumen\Application;
 
 /**
  * Class RegistersResources
@@ -129,17 +129,11 @@ protected function hasMany()
      * @param $action
      * @return Route
      */
-    protected function createRoute(Registrar $router, $method, $uri, $action)
+    protected function createRoute(Application $router, $method, $uri, $action)
     {
         /** @var Route $route */
-        $route = $router->{$method}($uri, $action);
-        $route->defaults(ResourceRegistrar::PARAM_RESOURCE_TYPE, $this->resourceType);
-
-        if ($idConstraint = $this->idConstraint($uri)) {
-            $route->where(ResourceRegistrar::PARAM_RESOURCE_ID, $idConstraint);
-        }
-
-        return $route;
+        $router->{$method}($uri, $action);
+        return $router;
     }
 
     /**

diff --git a/src/Routing/RelationshipsGroup.php b/src/Routing/RelationshipsGroup.php
@@ -19,9 +19,9 @@
 namespace CloudCreativity\LaravelJsonApi\Routing;
 
 use Generator;
-use Illuminate\Contracts\Routing\Registrar;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Fluent;
+use Laravel\Lumen\Application;
 
 /**
  * Class RelationshipsGroup
@@ -48,7 +48,7 @@ public function __construct($resourceType, Fluent $options)
     /**
      * @param Registrar $router
      */
-    public function addRelationships(Registrar $router)
+    public function addRelationships(Application $router)
     {
         foreach ($this->relationships() as $relationship => $options) {
             foreach ($options['actions'] as $action) {
@@ -63,18 +63,16 @@ public function addRelationships(Registrar $router)
      * @param $action
      * @return Route
      */
-    protected function relationshipRoute(Registrar $router, $relationship, $action)
+    protected function relationshipRoute(Application $router, $relationship, $action)
     {
-        $route = $this->createRoute(
+        $this->createRoute(
             $router,
             $this->routeMethod($action),
             $this->routeUrl($relationship, $action),
             $this->routeAction($relationship, $action)
         );
 
-        $route->defaults(ResourceRegistrar::PARAM_RELATIONSHIP_NAME, $relationship);
-
-        return $route;
+        return $router;
     }
 
     /**

diff --git a/src/Routing/ResourceGroup.php b/src/Routing/ResourceGroup.php
@@ -20,9 +20,9 @@
 
 use CloudCreativity\JsonApi\Utils\Str;
 use CloudCreativity\LaravelJsonApi\Api\ApiResource;
-use Illuminate\Contracts\Routing\Registrar;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Fluent;
+use Laravel\Lumen\Application;
 
 /**
  * Class ResourceGroup
@@ -56,7 +56,7 @@ public function __construct($resourceType, ApiResource $apiResource, Fluent $opt
     /**
      * @param Registrar $router
      */
-    public function addResource(Registrar $router)
+    public function addResource(Application $router)
     {
         $router->group($this->groupAction(), function ($router) {
             $this->addResourceRoutes($router);
@@ -118,7 +118,7 @@ protected function validators()
     /**
      * @param Registrar $router
      */
-    protected function addResourceRoutes(Registrar $router)
+    protected function addResourceRoutes(Application $router)
     {
         foreach ($this->resourceActions() as $action) {
             $this->resourceRoute($router, $action);
@@ -136,7 +136,7 @@ protected function resourceActions()
     /**
      * @param Registrar $router
      */
-    protected function addRelationshipRoutes(Registrar $router)
+    protected function addRelationshipRoutes(Application $router)
     {
         $this->relationshipsGroup()->addRelationships($router);
     }
@@ -154,7 +154,7 @@ protected function relationshipsGroup()
      * @param $action
      * @return Route
      */
-    protected function resourceRoute(Registrar $router, $action)
+    protected function resourceRoute(Application $router, $action)
     {
         return $this->createRoute(
             $router,