Revert Rector changes

Author: adamtomat

composer.json

@@ -31,7 +31,6 @@
         "php-coveralls/php-coveralls": "^2.4",
         "php-di/php-di": "^7.1.1",
         "phpunit/phpunit": "^12",
-        "rector/rector": "^2.1",
         "squizlabs/php_codesniffer": "^3.6.0"
     },
     "autoload": {

rector.php

@@ -6,7 +6,7 @@ class Formatting
 {
     public static function removeTrailingSlash($input)
     {
-        return rtrim((string) $input, '/\\');
+        return rtrim($input, '/\\');
     }
 
     public static function addTrailingSlash($input)
@@ -16,7 +16,7 @@ public static function addTrailingSlash($input)
 
     public static function removeLeadingSlash($input)
     {
-        return ltrim((string) $input, '/\\');
+        return ltrim($input, '/\\');
     }
 
     public static function addLeadingSlash($input)

src/Helpers/Formatting.php

@@ -21,27 +21,34 @@ class Route
     use Macroable;
 
     private $uri;
+    private $methods = [];
     private $routeAction;
     private $name;
+    private $invoker = null;
+    private $middlewareResolver = null;
     private $middleware = [];
     private $paramConstraints = [];
     private $controllerName = null;
     private $controllerMethod = null;
 
     public function __construct(
-        private array $methods,
+        array $methods,
         string $uri,
         $action,
-        private ?\Rareloop\Router\Invoker $invoker = null,
-        private ?\Rareloop\Router\MiddlewareResolver $middlewareResolver = null
+        ?Invoker $invoker = null,
+        ?MiddlewareResolver $resolver = null
     ) {
+        $this->invoker = $invoker;
+        $this->middlewareResolver = $resolver;
+
+        $this->methods = $methods;
         $this->setUri($uri);
         $this->setAction($action);
     }
 
     private function setUri($uri)
     {
-        $this->uri = rtrim((string) $uri, ' /');
+        $this->uri = rtrim($uri, ' /');
     }
 
     private function setAction($action)

src/Route.php

@@ -151,11 +151,15 @@ public function getMiddleware(): array
 
         $allControllerMiddleware = array_filter(
             $this->getController()->getControllerMiddleware(),
-            fn(ControllerMiddleware $middleware) => !$middleware->excludedForMethod($this->controllerMethod)
+            function (ControllerMiddleware $middleware) {
+                return !$middleware->excludedForMethod($this->controllerMethod);
+            }
         );
 
         return array_map(
-            fn($controllerMiddleware) => $controllerMiddleware->middleware(),
+            function ($controllerMiddleware) {
+                return $controllerMiddleware->middleware();
+            },
             $allControllerMiddleware
         );
     }
@@ -171,7 +175,7 @@ private function convertClassStringToFactory($string): Closure
         $this->controllerName = null;
         $this->controllerMethod = null;
 
-        @[$className, $method] = explode('@', $string);
+        @list($className, $method) = explode('@', $string);
 
         if (!isset($className) || !isset($method)) {
             throw new RouteClassStringParseException('Could not parse route controller from string: `' . $string . '`');
@@ -200,7 +204,9 @@ private function convertClassStringToFactory($string): Closure
                 return [$controller, $method];
             }
 
-            return fn($params = null) => $controller->$method($params);
+            return function ($params = null) use ($controller, $method) {
+                return $controller->$method($params);
+            };
         };
     }
 
@@ -218,7 +224,7 @@ public function getActionName()
         }
 
         if (is_callable($this->callable, false, $callableName)) {
-            [$controller, $method] = explode('::', $callableName);
+            list($controller, $method) = explode('::', $callableName);
 
             if ($controller === 'Closure') {
                 return $controller;

src/RouteAction.php

@@ -9,10 +9,12 @@
 class RouteGroup implements Routable
 {
     use VerbShortcutsTrait, Macroable;
+
+    protected $router;
     protected $prefix;
     protected $middleware = [];
 
-    public function __construct($params, protected $router)
+    public function __construct($params, $router)
     {
         $prefix = null;
         $middleware = [];
@@ -33,6 +35,7 @@ public function __construct($params, protected $router)
         }
 
         $this->prefix = is_string($prefix) ? trim($prefix, ' /') : null;
+        $this->router = $router;
     }
 
     private function appendPrefixToUri(string $uri)

src/RouteGroup.php

@@ -5,9 +5,11 @@
 class RouteParams implements \Iterator
 {
     private $position = 0;
+    private $params = [];
 
-    public function __construct(private array $params)
+    public function __construct(array $params)
     {
+        $this->params = $params;
     }
 
     public function __get($key)

src/RouteParams.php

@@ -79,15 +79,15 @@ private function convertRouteToAltoRouterUri(Route $route, AltoRouter $altoRoute
     {
         $output = $route->getUri();
 
-        preg_match_all('/{\s*([a-zA-Z0-9]+\??)\s*}/s', (string) $route->getUri(), $matches);
+        preg_match_all('/{\s*([a-zA-Z0-9]+\??)\s*}/s', $route->getUri(), $matches);
 
         $paramConstraints = $route->getParamConstraints();
 
         for ($i = 0; $i < count($matches[0]); $i++) {
             $match = $matches[0][$i];
             $paramKey = $matches[1][$i];
 
-            $optional = str_ends_with($paramKey, '?');
+            $optional = substr($paramKey, -1) === '?';
             $paramKey = trim($paramKey, '?');
 
             $regex = $paramConstraints[$paramKey] ?? null;
@@ -109,7 +109,7 @@ private function convertRouteToAltoRouterUri(Route $route, AltoRouter $altoRoute
             $output = str_replace($match, $replacement, $output);
         }
 
-        return ltrim((string) $output, ' /');
+        return ltrim($output, ' /');
     }
 
     public function map(array $verbs, string $uri, $callback): Route
@@ -180,7 +180,9 @@ protected function handle($route, $request, $params)
 
         // Apply all the base middleware and trigger the route handler as the last in the chain
         $middlewares = array_merge($this->baseMiddleware, [
-            fn($request) => $route->handle($request, $params),
+            function ($request) use ($route, $params) {
+                return $route->handle($request, $params);
+            },
         ]);
 
         // Create and process the dispatcher
@@ -197,7 +199,9 @@ protected function handle($route, $request, $params)
 
     public function has(string $name)
     {
-        $routes = array_filter($this->routes, fn($route) => $route->getName() === $name);
+        $routes = array_filter($this->routes, function ($route) use ($name) {
+            return $route->getName() === $name;
+        });
 
         return count($routes) > 0;
     }
@@ -223,7 +227,7 @@ public function url(string $name, $params = [])
                 $regex = $paramConstraints[$key] ?? false;
 
                 if ($regex) {
-                    if (!preg_match('/' . $regex . '/', (string) $value)) {
+                    if (!preg_match('/' . $regex . '/', $value)) {
                         throw new RouteParamFailedConstraintException(
                             'Value `' . $value . '` for param `' . $key . '` fails constraint `' . $regex . '`'
                         );
@@ -234,7 +238,7 @@ public function url(string $name, $params = [])
 
         try {
             return $this->altoRouter->generate($name, $params);
-        } catch (\Exception) {
+        } catch (\Exception $e) {
             throw new NamedRouteNotFoundException($name);
         }
     }

src/Router.php

@@ -2,13 +2,12 @@
 
 namespace Rareloop\Router\Test;
 
-use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Rareloop\Router\ControllerMiddlewareOptions;
 
 class ControllerMiddlewareOptionsTest extends TestCase
 {
-    #[Test]
+    /** @test */
     public function by_default_no_methods_are_excluded()
     {
         $options = new ControllerMiddlewareOptions;
@@ -17,15 +16,15 @@ public function by_default_no_methods_are_excluded()
         $this->assertFalse($options->excludedForMethod('bar'));
     }
 
-    #[Test]
+    /** @test */
     public function only_is_chainable()
     {
         $options = new ControllerMiddlewareOptions;
 
         $this->assertSame($options, $options->only('foo'));
     }
 
-    #[Test]
+    /** @test */
     public function can_use_only_to_limit_methods()
     {
         $options = new ControllerMiddlewareOptions;
@@ -36,7 +35,7 @@ public function can_use_only_to_limit_methods()
         $this->assertTrue($options->excludedForMethod('bar'));
     }
 
-    #[Test]
+    /** @test */
     public function can_use_only_to_limit_multiple_methods()
     {
         $options = new ControllerMiddlewareOptions;
@@ -48,15 +47,15 @@ public function can_use_only_to_limit_multiple_methods()
         $this->assertTrue($options->excludedForMethod('baz'));
     }
 
-    #[Test]
+    /** @test */
     public function except_is_chainable()
     {
         $options = new ControllerMiddlewareOptions;
 
         $this->assertSame($options, $options->except('foo'));
     }
 
-    #[Test]
+    /** @test */
     public function can_use_except_to_limit_methods()
     {
         $options = new ControllerMiddlewareOptions;
@@ -67,7 +66,7 @@ public function can_use_except_to_limit_methods()
         $this->assertFalse($options->excludedForMethod('bar'));
     }
 
-    #[Test]
+    /** @test */
     public function can_use_except_to_limit_multiple_methods()
     {
         $options = new ControllerMiddlewareOptions;

tests/ControllerMiddlewareOptionsTest.php

@@ -6,11 +6,10 @@
 use Rareloop\Router\ControllerMiddleware;
 use Rareloop\Router\ControllerMiddlewareOptions;
 use Rareloop\Router\Test\Middleware\AddHeaderMiddleware;
-use PHPUnit\Framework\Attributes\Test;
 
 class ControllerMiddlewareTest extends TestCase
 {
-    #[Test]
+    /** @test */
     public function can_retrieve_middleware()
     {
         $middleware = new AddHeaderMiddleware('X-Header', 'testing123');
@@ -21,7 +20,7 @@ public function can_retrieve_middleware()
         $this->assertSame($middleware, $controllerMiddleware->middleware());
     }
 
-    #[Test]
+    /** @test */
     public function can_retrieve_options()
     {
         $middleware = new AddHeaderMiddleware('X-Header', 'testing123');