Merge pull request #36 from mezzio/renovate/lock-file-maintenance

Lock file maintenance, improve `UrlHelper` input types
mezzio · Jan 14, 2023 · 49b67ee · 49b67ee
2 parents 374e16c + 5f8a3f3
commit 49b67ee
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 36 deletions.
diff --git a/composer.json b/composer.json
@@ -45,9 +45,9 @@
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.5.0",
-        "phpunit/phpunit": "^9.5.26",
-        "psalm/plugin-phpunit": "^0.18.0",
-        "vimeo/psalm": "^5.0"
+        "phpunit/phpunit": "^9.5.28",
+        "psalm/plugin-phpunit": "^0.18.4",
+        "vimeo/psalm": "^5.4"
     },
     "conflict": {
         "container-interop/container-interop": "<1.2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/UrlHelper.php b/src/UrlHelper.php
@@ -10,6 +10,7 @@
 
 /**
  * @final
+ * @psalm-import-type UrlGeneratorOptions from BaseHelper
  */
 class UrlHelper extends AbstractHelper
 {
@@ -22,10 +23,13 @@ public function __construct(private BaseHelper $helper)
     /**
      * Proxies to `Mezzio\Helper\UrlHelper::generate()`
      *
-     * @param array $options Can have the following keys:
+     * @param array<string, mixed> $routeParams
+     * @param array<string, mixed> $queryParams
+     * @param array<string, mixed> $options Can have the following keys:
      *     - router (array): contains options to be passed to the router
      *     - reuse_result_params (bool): indicates if the current RouteResult
      *       parameters will be used, defaults to true
+     * @psalm-param UrlGeneratorOptions $options
      * @return string
      */
     public function __invoke(