Merge branch '4.x-RefactorRouteGroup' into 4.x

Closes #2612

CHANGELOG.md

@@ -24,6 +24,7 @@
 
 ### Removed
 
+- [#2612](https://github.com/slimphp/Slim/pull/2612) Remove Routable, refactored RouteGroup and Route interface
 - [#2589](https://github.com/slimphp/Slim/pull/2589) Remove App::$settings altogether
 - [#2587](https://github.com/slimphp/Slim/pull/2587) Remove Pimple as a dev-dependency
 - [#2398](https://github.com/slimphp/Slim/pull/2398) Slim no longer has error handling built into App. Add ErrorMiddleware() as the outermost middleware.

Slim/Interfaces/RouteGroupInterface.php

@@ -11,22 +11,10 @@
 
 use Psr\Http\Server\MiddlewareInterface;
 use Slim\App;
+use Slim\MiddlewareDispatcher;
 
-/**
- * RouteGroup Interface
- *
- * @package Slim
- * @since   3.0.0
- */
 interface RouteGroupInterface
 {
-    /**
-     * Get route pattern
-     *
-     * @return string
-     */
-    public function getPattern(): string;
-
     /**
      * @param MiddlewareInterface|string|callable $middleware
      * @return RouteGroupInterface
@@ -39,6 +27,19 @@ public function add($middleware): RouteGroupInterface;
      */
     public function addMiddleware(MiddlewareInterface $middleware): RouteGroupInterface;
 
+    /**
+     * @param MiddlewareDispatcher $dispatcher
+     * @return RouteGroupInterface
+     */
+    public function appendMiddlewareToDispatcher(MiddlewareDispatcher $dispatcher): RouteGroupInterface;
+
+    /**
+     * Get route pattern
+     *
+     * @return string
+     */
+    public function getPattern(): string;
+
     /**
      * Execute route group callable in the context of the Slim App
      *

Slim/Interfaces/RouteInterface.php

@@ -13,12 +13,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 
-/**
- * Route Interface
- *
- * @package Slim
- * @since   3.0.0
- */
 interface RouteInterface
 {
     /**
@@ -38,6 +32,21 @@ public function getArgument(string $name, $default = null);
      */
     public function getArguments(): array;
 
+    /**
+     * Get route callable
+     *
+     * @return callable|string
+     */
+    public function getCallable();
+
+    /**
+     * Set route callable
+     *
+     * @param callable|string $callable
+     * @return RouteInterface
+     */
+    public function setCallable($callable): RouteInterface;
+
     /**
      * Get route name
      *
@@ -95,11 +104,10 @@ public function addMiddleware(MiddlewareInterface $middleware): RouteInterface;
     /**
      * Prepare the route for use
      *
-     * @param ServerRequestInterface $request
      * @param array $arguments
      * @return RouteInterface
      */
-    public function prepare(ServerRequestInterface $request, array $arguments): RouteInterface;
+    public function prepare(array $arguments): RouteInterface;
 
     /**
      * Run route

Slim/Middleware/RoutingMiddleware.php

@@ -74,7 +74,7 @@ public function performRouting(ServerRequestInterface $request): ServerRequestIn
                 $routeArguments = $routingResults->getRouteArguments();
                 $routeIdentifier = $routingResults->getRouteIdentifier() ?? '';
                 $route = $this->router->lookupRoute($routeIdentifier);
-                $route->prepare($request, $routeArguments);
+                $route->prepare($routeArguments);
                 return $request
                     ->withAttribute('route', $route)
                     ->withAttribute('routingResults', $routingResults);