Add return types and factory methods for PATCH and OPTIONS requests

Author: cundd

Classes/Handler/CrudHandler.php

@@ -196,9 +196,9 @@ public function configureRoutes(RouterInterface $router, RestRequestInterface $r
         $router->add(Route::put($resourceType . '/{slug}/?', [$this, 'update']));
         $router->add(Route::post($resourceType . '/{slug}/?', [$this, 'update']));
         $router->add(Route::delete($resourceType . '/{slug}/?', [$this, 'delete']));
-        $router->add(Route::routeWithPatternAndMethod($resourceType . '/{slug}/?', 'PATCH', [$this, 'update']));
+        $router->add(Route::patch($resourceType . '/{slug}/?', [$this, 'update']));
         $router->add(Route::get($resourceType . '/{slug}/{slug}/?', [$this, 'getProperty']));
-        $router->add(Route::routeWithPatternAndMethod($resourceType . '/?', 'OPTIONS', [$this, 'options']));
+        $router->add(Route::options($resourceType . '/?', [$this, 'options']));
     }
 
     /**

Classes/Router/Route.php

@@ -61,7 +61,7 @@ public function __construct($pattern, $method, callable $callback)
      * @param callable $callback
      * @return static
      */
-    public static function get($pattern, callable $callback)
+    public static function get($pattern, callable $callback): \Cundd\Rest\Router\Route
     {
         return new static($pattern, 'GET', $callback);
     }
@@ -73,7 +73,7 @@ public static function get($pattern, callable $callback)
      * @param callable $callback
      * @return static
      */
-    public static function post($pattern, callable $callback)
+    public static function post($pattern, callable $callback): Route
     {
         return new static($pattern, 'POST', $callback);
     }
@@ -85,7 +85,7 @@ public static function post($pattern, callable $callback)
      * @param callable $callback
      * @return static
      */
-    public static function put($pattern, callable $callback)
+    public static function put($pattern, callable $callback): Route
     {
         return new static($pattern, 'PUT', $callback);
     }
@@ -97,11 +97,35 @@ public static function put($pattern, callable $callback)
      * @param callable $callback
      * @return static
      */
-    public static function delete($pattern, callable $callback)
+    public static function delete($pattern, callable $callback): Route
     {
         return new static($pattern, 'DELETE', $callback);
     }
 
+    /**
+     * Creates a new Route with the given pattern and callback for the method OPTIONS
+     *
+     * @param string   $pattern
+     * @param callable $callback
+     * @return static
+     */
+    public static function options($pattern, callable $callback): Route
+    {
+        return new static($pattern, 'OPTIONS', $callback);
+    }
+
+    /**
+     * Creates a new Route with the given pattern and callback for the method PATCH
+     *
+     * @param string   $pattern
+     * @param callable $callback
+     * @return static
+     */
+    public static function patch($pattern, callable $callback): Route
+    {
+        return new static($pattern, 'PATCH', $callback);
+    }
+
     /**
      * Creates a new Route with the given pattern and callback for the method GET
      *

Classes/Router/RouteFactoryInterface.php

@@ -4,6 +4,7 @@
 namespace Cundd\Rest\Router;
 
 use Cundd\Rest\Domain\Model\ResourceType;
+use Cundd\Rest\Router\Route;
 
 /**
  * Interface for Route factory methods
@@ -15,34 +16,52 @@ interface RouteFactoryInterface
      *
      * @param string|ResourceType $pattern
      * @param callable            $callback
-     * @return static
+     * @return Route
      */
-    public static function get($pattern, callable $callback);
+    public static function get($pattern, callable $callback): Route;
 
     /**
      * Creates a new Route with the given pattern and callback for the method POST
      *
      * @param string|ResourceType $pattern
      * @param callable            $callback
-     * @return static
+     * @return \Cundd\Rest\Router\Route
      */
-    public static function post($pattern, callable $callback);
+    public static function post($pattern, callable $callback): Route;
 
     /**
      * Creates a new Route with the given pattern and callback for the method PUT
      *
      * @param string|ResourceType $pattern
      * @param callable            $callback
-     * @return static
+     * @return \Cundd\Rest\Router\Route
      */
-    public static function put($pattern, callable $callback);
+    public static function put($pattern, callable $callback): Route;
 
     /**
      * Creates a new Route with the given pattern and callback for the method DELETE
      *
      * @param string|ResourceType $pattern
      * @param callable            $callback
-     * @return static
+     * @return \Cundd\Rest\Router\Route
      */
-    public static function delete($pattern, callable $callback);
+    public static function delete($pattern, callable $callback): Route;
+
+    /**
+     * Creates a new Route with the given pattern and callback for the method OPTIONS
+     *
+     * @param string   $pattern
+     * @param callable $callback
+     * @return \Cundd\Rest\Router\Route
+     */
+    public static function options($pattern, callable $callback): Route;
+
+    /**
+     * Creates a new Route with the given pattern and callback for the method PATCH
+     *
+     * @param string   $pattern
+     * @param callable $callback
+     * @return \Cundd\Rest\Router\Route
+     */
+    public static function patch($pattern, callable $callback): Route;
 }

Tests/Unit/Router/RouteTest.php

@@ -322,5 +322,7 @@ public function factoryMethodsTest()
         $this->assertEquals('POST', Route::post('path/sub-path', $this->cb)->getMethod());
         $this->assertEquals('PUT', Route::put('path/sub-path', $this->cb)->getMethod());
         $this->assertEquals('DELETE', Route::delete('path/sub-path', $this->cb)->getMethod());
+        $this->assertEquals('OPTIONS', Route::options('path/sub-path', $this->cb)->getMethod());
+        $this->assertEquals('PATCH', Route::patch('path/sub-path', $this->cb)->getMethod());
     }
 }