From b2aaaa8fa04f690fed598c31b65a6405b565c303 Mon Sep 17 00:00:00 2001
From: Sam Light <sam@lightscale.co.uk>
Date: Wed, 10 Jun 2026 21:37:20 +0100
Subject: Removed abstract strategy and broke all function implementations to
 traits

---
 src/AbstractStrategy.php                          | 44 -----------------------
 src/BasicStrategy.php                             | 26 ++++----------
 src/Concerns/Strategy/ParsesStringParameters.php  | 21 +++++++++++
 src/Concerns/Strategy/RunsMiddleware.php          | 31 ++++++++++++++++
 src/Concerns/Strategy/RunsRoute.php               | 23 ++++++++++++
 src/Concerns/Strategy/ThrowsNotFoundException.php | 17 +++++++++
 6 files changed, 98 insertions(+), 64 deletions(-)
 delete mode 100644 src/AbstractStrategy.php
 create mode 100644 src/Concerns/Strategy/ParsesStringParameters.php
 create mode 100644 src/Concerns/Strategy/RunsMiddleware.php
 create mode 100644 src/Concerns/Strategy/RunsRoute.php
 create mode 100644 src/Concerns/Strategy/ThrowsNotFoundException.php

diff --git a/src/AbstractStrategy.php b/src/AbstractStrategy.php
deleted file mode 100644
index a68f5c1..0000000
--- a/src/AbstractStrategy.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Lightscale\Router;
-
-use InvalidArgumentException;
-use Lightscale\Router\Contracts\Middleware;
-use Lightscale\Router\Contracts\Strategy;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-abstract class AbstractStrategy implements Strategy
-{
-    /**
-     * @param Middleware[] $middlewares
-     * @param callable(RequestInterface): ResponseInterface $handler
-     */
-    public function runMiddleware(
-        RequestInterface $request,
-        array $middlewares,
-        callable $handler,
-    ): ResponseInterface {
-        $handler = count($middlewares) > 0 ? array_reduce(
-            array_reverse($middlewares),
-            fn (callable $handler, Middleware $middleware) => fn (ServerRequestInterface $request) => $middleware->handle($request, $handler),
-            $handler
-        ) : $handler;
-
-        return $handler($request);
-    }
-
-    public function parseParameters(array $parameters): array
-    {
-        foreach ($parameters as $key => $value) {
-            if (!is_string($value)) {
-                throw new InvalidArgumentException("Parameter {$key} is not a string.");
-            }
-        }
-
-        return $parameters;
-    }
-}
diff --git a/src/BasicStrategy.php b/src/BasicStrategy.php
index d2ee91a..09d8db0 100644
--- a/src/BasicStrategy.php
+++ b/src/BasicStrategy.php
@@ -4,26 +4,12 @@ declare(strict_types=1);
 
 namespace Lightscale\Router;
 
-use Lightscale\Router\Exceptions\InvalidResponseException;
-use Lightscale\Router\Exceptions\NotFoundException;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
+use Lightscale\Router\Contracts\Strategy;
 
-class BasicStrategy extends AbstractStrategy
+class BasicStrategy implements Strategy
 {
-    public function runRoute(RouteCall $call): ResponseInterface
-    {
-        $result = ($call->route->getHandler())($call);
-
-        if ($result instanceof ResponseInterface) {
-            return $result;
-        }
-
-        throw new InvalidResponseException();
-    }
-
-    public function notFound(RequestInterface $request): ResponseInterface
-    {
-        throw new NotFoundException();
-    }
+    use Concerns\Strategy\RunsRoute;
+    use Concerns\Strategy\RunsMiddleware;
+    use Concerns\Strategy\ThrowsNotFoundException;
+    use Concerns\Strategy\ParsesStringParameters;
 }
diff --git a/src/Concerns/Strategy/ParsesStringParameters.php b/src/Concerns/Strategy/ParsesStringParameters.php
new file mode 100644
index 0000000..6dbc628
--- /dev/null
+++ b/src/Concerns/Strategy/ParsesStringParameters.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Lightscale\Router\Concerns\Strategy;
+
+use InvalidArgumentException;
+
+trait ParsesStringParameters
+{
+    public function parseParameters(array $parameters): array
+    {
+        foreach ($parameters as $key => $value) {
+            if (!is_string($value)) {
+                throw new InvalidArgumentException("Parameter {$key} is not a string.");
+            }
+        }
+
+        return $parameters;
+    }
+}
diff --git a/src/Concerns/Strategy/RunsMiddleware.php b/src/Concerns/Strategy/RunsMiddleware.php
new file mode 100644
index 0000000..4816a04
--- /dev/null
+++ b/src/Concerns/Strategy/RunsMiddleware.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Lightscale\Router\Concerns\Strategy;
+
+use Lightscale\Router\Contracts\Middleware;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+trait RunsMiddleware
+{
+    /**
+     * @param Middleware[] $middlewares
+     * @param callable(RequestInterface): ResponseInterface $handler
+     */
+    public function runMiddleware(
+        RequestInterface $request,
+        array $middlewares,
+        callable $handler,
+    ): ResponseInterface {
+        $handler = count($middlewares) > 0 ? array_reduce(
+            array_reverse($middlewares),
+            fn (callable $handler, Middleware $middleware) => fn (ServerRequestInterface $request) => $middleware->handle($request, $handler),
+            $handler
+        ) : $handler;
+
+        return $handler($request);
+    }
+}
diff --git a/src/Concerns/Strategy/RunsRoute.php b/src/Concerns/Strategy/RunsRoute.php
new file mode 100644
index 0000000..849ae80
--- /dev/null
+++ b/src/Concerns/Strategy/RunsRoute.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Lightscale\Router\Concerns\Strategy;
+
+use Lightscale\Router\Exceptions\InvalidResponseException;
+use Lightscale\Router\RouteCall;
+use Psr\Http\Message\ResponseInterface;
+
+trait RunsRoute
+{
+    public function runRoute(RouteCall $call): ResponseInterface
+    {
+        $result = ($call->route->getHandler())($call);
+
+        if ($result instanceof ResponseInterface) {
+            return $result;
+        }
+
+        throw new InvalidResponseException();
+    }
+}
diff --git a/src/Concerns/Strategy/ThrowsNotFoundException.php b/src/Concerns/Strategy/ThrowsNotFoundException.php
new file mode 100644
index 0000000..996bdb5
--- /dev/null
+++ b/src/Concerns/Strategy/ThrowsNotFoundException.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Lightscale\Router\Concerns\Strategy;
+
+use Lightscale\Router\Exceptions\NotFoundException;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+trait ThrowsNotFoundException
+{
+    public function notFound(RequestInterface $_): ResponseInterface
+    {
+        throw new NotFoundException();
+    }
+}
-- 
cgit v1.2.3