Include global constraints and middleware when listing routes in the cli

Author: freost

phpstan-baseline.neon

@@ -44,3 +44,7 @@ parameters:
 			message: "#^Call to an undefined static method PDO::connect\\(\\)\\.$#"
 			count: 1
 			path: src/mako/database/connections/Connection.php
+		-
+			message: "#^Call to protected method orderMiddlewareByPriority\\(\\) of class mako\\\\http\\\\routing\\\\Dispatcher\\.$#"
+			count: 1
+			path: src/mako/application/cli/commands/app/ListRoutes.php

src/mako/application/cli/commands/app/ListRoutes.php

@@ -10,7 +10,9 @@
 use Closure;
 use mako\cli\input\arguments\Argument;
 use mako\cli\output\helpers\Alert;
+use mako\http\routing\Dispatcher;
 use mako\http\routing\Route;
+use mako\http\routing\Router;
 use mako\http\routing\Routes;
 use mako\reactor\Command;
 use mako\utility\Arr;
@@ -86,7 +88,7 @@ protected function routeMatches(string $filter, Route $route): bool
 	/**
 	 * Executes the command.
 	 */
-	public function execute(Routes $routes, bool $detailed = false, ?string $filter = null): void
+	public function execute(Routes $routes, Dispatcher $dispatcher, Router $router, bool $detailed = false, ?string $filter = null): void
 	{
 		$this->clear();
 
@@ -102,9 +104,23 @@ public function execute(Routes $routes, bool $detailed = false, ?string $filter
 
 			$matched++;
 
+			$middleware = (function ($middleware) {
+				/** @var \mako\http\routing\Dispatcher $this */
+				return $this->orderMiddlewareByPriority($middleware);
+			})
+			->bindTo($dispatcher, Dispatcher::class)([
+				...$dispatcher->getGlobalMiddleware(),
+				...$route->getMiddleware(),
+			]);
+
+			$constraints = [
+				...$router->getGlobalConstraints(),
+				...$route->getConstraints(),
+			];
+
 			$methods     = implode(', ', $route->getMethods());
-			$middleware  = implode(', ', Arr::pluck($route->getMiddleware(), 'middleware'));
-			$constraints = implode(', ', $route->getConstraints());
+			$middleware  = implode(', ', Arr::pluck($middleware, 'middleware'));
+			$constraints = implode(', ', $constraints);
 			$name        = $route->getName();
 
 			$this->alert("Path: {$route->getRoute()}", Alert::INFO);

src/mako/http/routing/Dispatcher.php

@@ -82,6 +82,14 @@ public function registerGlobalMiddleware(string $middleware, mixed ...$parameter
 		return $this;
 	}
 
+	/**
+	 * Returns the global middleware.
+	 */
+	public function getGlobalMiddleware(): array
+	{
+		return $this->globalMiddleware;
+	}
+
 	/**
 	 * Orders resolved middleware by priority.
 	 */
@@ -91,11 +99,21 @@ protected function orderMiddlewareByPriority(array $middleware): array
 			return $middleware;
 		}
 
-		$priority = array_intersect_key($this->middlewarePriority, $middleware) + array_fill_keys(array_keys(array_diff_key($middleware, $this->middlewarePriority)), static::MIDDLEWARE_DEFAULT_PRIORITY);
+		// Ensure that each middleware only exists once in the final list
+
+		$middlewareByName = [];
+
+		foreach ($middleware as $value) {
+			$middlewareByName[$value['middleware']] = $value;
+		}
+
+		// Sort middleware by priority
+
+		$priority = array_intersect_key($this->middlewarePriority, $middlewareByName) + array_fill_keys(array_keys(array_diff_key($middlewareByName, $this->middlewarePriority)), static::MIDDLEWARE_DEFAULT_PRIORITY);
 
 		asort($priority);
 
-		return [...$priority, ...$middleware];
+		return [...$priority, ...$middlewareByName];
 	}
 
 	/**
@@ -104,17 +122,7 @@ protected function orderMiddlewareByPriority(array $middleware): array
 	protected function addMiddlewareToStack(Onion $onion, array $middleware): void
 	{
 		if (empty($middleware) === false) {
-			// Group middleware
-
-			$layers = [];
-
-			foreach ($middleware as $layer) {
-				$layers[$layer['middleware']] = $layer;
-			}
-
-			// Add ordered middleware to stack
-
-			foreach ($this->orderMiddlewareByPriority($layers) as $layer) {
+			foreach ($this->orderMiddlewareByPriority($middleware) as $layer) {
 				$onion->addLayer($layer['middleware'], $layer['parameters']);
 			}
 		}

src/mako/http/routing/Router.php

@@ -53,6 +53,14 @@ public function registerGlobalConstraint(string $constraint, mixed ...$parameter
 		return $this;
 	}
 
+	/**
+	 * Returns the global constraints.
+	 */
+	public function getGlobalConstraints(): array
+	{
+		return $this->globalConstraints;
+	}
+
 	/**
 	 * Returns TRUE if the route matches the request path and FALSE if not.
 	 */