add middleware and improvement router

Author: Fady Michel

composer.json

@@ -17,7 +17,9 @@
     ],
     "require": {
         "php": ">=7.3",
-        "psr/http-message": "~1.0"
+        "psr/http-message": "^1.0",
+        "psr/http-server-middleware": "^1.0",
+        "psr/http-factory": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~7.1"

composer.lock

@@ -0,0 +1,88 @@
+<?php
+
+use LiteApp\Middleware\ControllerMiddleware;
+
+require 'vendor/autoload.php';
+error_reporting(E_ALL);
+ini_set("display_errors", 1);
+
+
+class HomeController
+{
+
+    public function __invoke()
+    {
+        return '<p>Hello world</p>';
+    }
+}
+
+class ArticleController
+{
+
+    public function list()
+    {
+        return '<ul>
+                    <li>Article 1</li>
+                    <li>Article 2</li>
+                </ul>';
+    }
+
+    public function view(int $id)
+    {
+        return "<p>Article $id</p>";
+    }
+}
+
+
+//$router = new \DevCoder\Router([
+//    new \DevCoder\Route('home_page', '/', function () {
+//        return '<p>Hello world</p>';
+//    })
+//]);
+
+$router = new \DevCoder\Router([
+    new \DevCoder\Route('home_page', '/', function () {
+        return '<p>Hello world</p>';
+    }),
+//    new \DevCoder\Route('home_page', '/', [HomeController::class]),
+    new \DevCoder\Route('articles', '/articles', [ArticleController::class, 'list']),
+    new \DevCoder\Route('article_view', '/articles/{id}', [ArticleController::class, 'view'])
+]);
+
+try {
+
+    $route = $router->matchFromPath('/articles/1', 'GET');
+
+    $callback = $route->getCallback();
+    $arguments = $route->getVars();
+
+//
+    if (is_array($callback)) {
+
+        $controller = new $callback[0]();
+        if (is_callable($controller)) {
+            $callback = $controller;
+        }else {
+            $action = $callback[1] ?? null;
+            if (!method_exists($controller, $action)) {
+
+                if ($action === null) {
+                    throw new \BadMethodCallException(sprintf('Please use a Method on class %s.', get_class($controller)));
+                }
+                throw new \BadMethodCallException(sprintf('Method "%s" on class %s does not exist.', $action, get_class($controller)));
+            }
+
+            $callback = [$controller, $action];
+        }
+
+    }
+
+    echo $callback(...array_values($arguments));
+
+} catch (\BadMethodCallException $e) {
+    throw  $e;
+} catch (\Exception $e) {
+    header("HTTP/1.0 404 Not Found");
+}
+
+

index.php

@@ -21,7 +21,7 @@ class Route
     /**
      * @var array<string>
      */
-    protected $controller = [];
+    protected $parameters = [];
 
     /**
      * @var array<string>
@@ -33,14 +33,25 @@ class Route
      */
     protected $vars = [];
 
-    public function __construct(string $name, string $path, array $controller, array $methods = ['GET', 'POST'])
+    /**
+     * Route constructor.
+     * @param string $name
+     * @param string $path
+     * @param array $parameters
+     *    $parameters = [
+     *      0 => (string) Controller name : HomeController::class.
+     *      1 => (string|null) Method name or null if invoke method
+     *    ]
+     * @param array $methods
+     */
+    public function __construct(string $name, string $path, array $parameters, array $methods = ['GET', 'POST'])
     {
         if ($methods === []) {
             throw new \InvalidArgumentException('HTTP methods argument was empty; must contain at least one method');
         }
         $this->name = $name;
         $this->path = $path;
-        $this->controller = $controller;
+        $this->parameters = $parameters;
         $this->methods = $methods;
     }
 
@@ -74,9 +85,9 @@ public function getPath(): string
         return $this->path;
     }
 
-    public function getController(): array
+    public function getParameters(): array
     {
-        return $this->controller;
+        return $this->parameters;
     }
 
     public function getMethods(): array

src/Route.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace DevCoder;
+
+use Exception;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+/**
+ * Class RouterMiddleware
+ * @package App\Middleware
+ */
+final class RouterMiddleware implements MiddlewareInterface
+{
+    const CONTROLLER = '_controller';
+    const ACTION = '_action';
+    const NAME = '_name';
+
+    /**
+     * @var RouterInterface
+     */
+    private $router;
+    /**
+     * @var ResponseFactoryInterface
+     */
+    private $responseFactory;
+
+    /**
+     * RouterMiddleware constructor.
+     * @param RouterInterface $router
+     * @param ResponseFactoryInterface $responseFactory
+     */
+    public function __construct(RouterInterface $router, ResponseFactoryInterface $responseFactory)
+    {
+        $this->router = $router;
+        $this->responseFactory = $responseFactory;
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        try {
+            $route = $this->router->match($request);
+            $controller = $route->getParameters();
+            $attributes = array_merge([
+                static::CONTROLLER => $controller[0],
+                static::ACTION => $controller[1] ?? null,
+                static::NAME => $route->getName(),
+            ], $route->getVars());
+
+            foreach ($attributes as $key => $value) {
+                $request = $request->withAttribute($key, $value);
+            }
+
+        } catch (Exception $exception) {
+            return $this->responseFactory->createResponse(404);
+        }
+
+        return $handler->handle($request);
+    }
+}

src/RouterMiddleware.php

@@ -38,7 +38,7 @@ public function testMatchRoute() {
         $route = $this->router->matchFromPath('/view/article/25', 'GET');
         $this->assertInstanceOf(Route::class, $route);
 
-        $this->assertNotEmpty($route->getController());
+        $this->assertNotEmpty($route->getParameters());
         $this->assertNotEmpty($route->getMethods());
         $this->assertSame(['id' => '25'], $route->getVars());