Fix PHP 8.4 issues

slimphp · Dec 1, 2024 · 00dad50 · 00dad50
1 parent eed5575
commit 00dad50
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Slim/Routing/Route.php b/Slim/Routing/Route.php
@@ -27,7 +27,7 @@ final class Route implements MiddlewareCollectionInterface
     /**
      * @param array<string> $methods
      */
-    public function __construct(array $methods, string $pattern, callable|string $handler, RouteGroup $group = null)
+    public function __construct(array $methods, string $pattern, callable|string $handler, ?RouteGroup $group)
     {
         $this->methods = $methods;
         $this->pattern = $pattern;

diff --git a/Slim/Routing/RouteGroup.php b/Slim/Routing/RouteGroup.php
@@ -27,7 +27,7 @@ final class RouteGroup implements MiddlewareCollectionInterface, RouteCollection
 
     private ?RouteGroup $group;
 
-    public function __construct(string $prefix, callable $callback, Router $router, RouteGroup $group = null)
+    public function __construct(string $prefix, callable $callback, Router $router, ?RouteGroup $group)
     {
         $this->prefix = sprintf('/%s', ltrim($prefix, '/'));
         $this->callback = $callback;

diff --git a/Slim/Routing/Router.php b/Slim/Routing/Router.php
@@ -32,7 +32,7 @@ public function map(array $methods, string $path, callable|string $handler): Rou
         }
 
         $routePattern = $this->normalizePath($path);
-        $route = new Route($methods, $routePattern, $handler);
+        $route = new Route($methods, $routePattern, $handler, null);
 
         $this->collector->addRoute($methods, $routePattern, $route);
 
@@ -42,7 +42,7 @@ public function map(array $methods, string $path, callable|string $handler): Rou
     public function group(string $path, callable $handler): RouteGroup
     {
         $routePattern = $this->normalizePath($path);
-        $routeGroup = new RouteGroup($routePattern, $handler, $this);
+        $routeGroup = new RouteGroup($routePattern, $handler, $this, null);
         $this->collector->addGroup($routePattern, $routeGroup);
 
         return $routeGroup;