Skip to content

Commit 49b67ee

Browse files
authored
Merge pull request #36 from mezzio/renovate/lock-file-maintenance
Lock file maintenance, improve `UrlHelper` input types
2 parents 374e16c + 5f8a3f3 commit 49b67ee

File tree

3 files changed

+40
-36
lines changed

3 files changed

+40
-36
lines changed

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
},
4646
"require-dev": {
4747
"laminas/laminas-coding-standard": "~2.5.0",
48-
"phpunit/phpunit": "^9.5.26",
49-
"psalm/plugin-phpunit": "^0.18.0",
50-
"vimeo/psalm": "^5.0"
48+
"phpunit/phpunit": "^9.5.28",
49+
"psalm/plugin-phpunit": "^0.18.4",
50+
"vimeo/psalm": "^5.4"
5151
},
5252
"conflict": {
5353
"container-interop/container-interop": "<1.2.0",

composer.lock

+32-32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/UrlHelper.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
/**
1212
* @final
13+
* @psalm-import-type UrlGeneratorOptions from BaseHelper
1314
*/
1415
class UrlHelper extends AbstractHelper
1516
{
@@ -22,10 +23,13 @@ public function __construct(private BaseHelper $helper)
2223
/**
2324
* Proxies to `Mezzio\Helper\UrlHelper::generate()`
2425
*
25-
* @param array $options Can have the following keys:
26+
* @param array<string, mixed> $routeParams
27+
* @param array<string, mixed> $queryParams
28+
* @param array<string, mixed> $options Can have the following keys:
2629
* - router (array): contains options to be passed to the router
2730
* - reuse_result_params (bool): indicates if the current RouteResult
2831
* parameters will be used, defaults to true
32+
* @psalm-param UrlGeneratorOptions $options
2933
* @return string
3034
*/
3135
public function __invoke(

0 commit comments

Comments
 (0)