Update support for Slim 4.15

Author: lcharette

composer.json

@@ -52,7 +52,7 @@
         "psr/event-dispatcher": "^1.0",
         "slim/csrf": "^1.3",
         "slim/psr7": "^1.4",
-        "slim/slim": "^4.14",
+        "slim/slim": "^4.15",
         "slim/twig-view": "^3.0",
         "symfony/console": "^6.4",
         "symfony/yaml": ">=4.4",
@@ -78,6 +78,15 @@
         "slam/phpstan-extensions": "^6.0",
         "symplify/monorepo-builder": "^11.2"
     },
+    "replace": {
+        "userfrosting/framework": "6.0.0-alpha.6",
+        "userfrosting/sprinkle-account": "6.0.0-alpha.6",
+        "userfrosting/sprinkle-admin": "6.0.0-alpha.6",
+        "userfrosting/sprinkle-core": "6.0.0-alpha.6",
+        "userfrosting/userfrosting": "6.0.0-alpha.6"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "UserFrosting\\": "packages/framework/src",
@@ -96,14 +105,5 @@
             "UserFrosting\\Tests\\App\\": "packages/skeleton/app/tests/",
             "Workers\\MonoRepo\\": "utils/"
         }
-    },
-    "replace": {
-        "userfrosting/framework": "6.0.0-alpha.6",
-        "userfrosting/sprinkle-account": "6.0.0-alpha.6",
-        "userfrosting/sprinkle-admin": "6.0.0-alpha.6",
-        "userfrosting/sprinkle-core": "6.0.0-alpha.6",
-        "userfrosting/userfrosting": "6.0.0-alpha.6"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }

packages/framework/composer.json

@@ -39,7 +39,7 @@
         "vlucas/valitron": "^1.2.3",
         "predis/predis": "^2.2",
         "twig/twig": "^3.3",
-        "slim/slim": "^4.14",
+        "slim/slim": "^4.15",
         "slim/psr7": "^1.4",
         "php-di/php-di": "^7.0",
         "php-di/slim-bridge": "^3.2",

packages/sprinkle-core/app/src/Util/RouteParserInterface.php

@@ -17,15 +17,18 @@
 use RuntimeException;
 use Slim\Interfaces\RouteParserInterface as SlimRouteParserInterface;
 
+/**
+ * Add fallback route to Slim's RouteParserInterface.
+ */
 interface RouteParserInterface extends SlimRouteParserInterface
 {
     /**
      * Build the path for a named route excluding the base path.
      *
-     * @param string                $routeName     Route name
-     * @param array<string, string> $data          Named argument replacement data
-     * @param array<string, string> $queryParams   Optional query string parameters
-     * @param string|null           $fallbackRoute Optional fallback route (the actual route, not the route name)
+     * @param string                                           $routeName     Route name
+     * @param array<string, string>                            $data          Named argument replacement data
+     * @param array<string, string | array<array-key, string>> $queryParams   Optional query string parameters
+     * @param string|null                                      $fallbackRoute Optional fallback route (the actual route, not the route name)
      *
      * @throws RuntimeException         If named route does not exist
      * @throws InvalidArgumentException If required data not provided
@@ -40,10 +43,10 @@ public function relativeUrlFor(
     /**
      * Build the path for a named route including the base path.
      *
-     * @param string                $routeName     Route name
-     * @param array<string, string> $data          Named argument replacement data
-     * @param array<string, string> $queryParams   Optional query string parameters
-     * @param string|null           $fallbackRoute Optional fallback route (the actual route, not the route name)
+     * @param string                                           $routeName     Route name
+     * @param array<string, string>                            $data          Named argument replacement data
+     * @param array<string, string | array<array-key, string>> $queryParams   Optional query string parameters
+     * @param string|null                                      $fallbackRoute Optional fallback route (the actual route, not the route name)
      *
      * @throws RuntimeException         If named route does not exist
      * @throws InvalidArgumentException If required data not provided
@@ -58,11 +61,11 @@ public function urlFor(
     /**
      * Get fully qualified URL for named route.
      *
-     * @param UriInterface          $uri
-     * @param string                $routeName     Route name
-     * @param array<string, string> $data          Named argument replacement data
-     * @param array<string, string> $queryParams   Optional query string parameters
-     * @param string|null           $fallbackRoute Optional fallback route (the actual route, not the route name)
+     * @param UriInterface                                     $uri
+     * @param string                                           $routeName     Route name
+     * @param array<string, string>                            $data          Named argument replacement data
+     * @param array<string, string | array<array-key, string>> $queryParams   Optional query string parameters
+     * @param string|null                                      $fallbackRoute Optional fallback route (the actual route, not the route name)
      */
     public function fullUrlFor(
         UriInterface $uri,