Skip to content

Commit

Permalink
Merge pull request #312 from odan/psr-http-message-2
Browse files Browse the repository at this point in the history
Bump psr/http-message requirement from '^1.1' to '^1.1 || ^2.0'
  • Loading branch information
akrabat authored Apr 28, 2024
2 parents 600832d + 07aa803 commit 1b35153
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"require": {
"php": "^7.4 || ^8.0",
"psr/http-message": "^1.1",
"psr/http-message": "^1.1 || ^2.0",
"slim/slim": "^4.12",
"twig/twig": "^3.8",
"symfony/polyfill-php81": "^1.29"
Expand Down
26 changes: 13 additions & 13 deletions tests/TwigRuntimeExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ protected function createRouteCollector(string $basePath): RouteCollector
* Map a route to the given route collector.
*
* @param RouteCollector $routeCollector
* @param array $methods
* @param string $pattern
* @param string $routeName
* @param array $methods
* @param string $pattern
* @param string $routeName
*
* @return RouteInterface
*/
Expand Down Expand Up @@ -79,11 +79,11 @@ public function isCurrentUrlProvider(): array
/**
* @dataProvider isCurrentUrlProvider
*
* @param string $pattern
* @param array $data
* @param string $path
* @param string $pattern
* @param array $data
* @param string $path
* @param string|null $basePath
* @param bool $expected
* @param bool $expected
*/
public function testIsCurrentUrl(string $pattern, array $data, string $path, ?string $basePath, bool $expected)
{
Expand Down Expand Up @@ -125,7 +125,7 @@ public function currentUrlProvider(): array
* @param string $pattern
* @param string $url
* @param string $basePath
* @param bool $withQueryString
* @param bool $withQueryString
*/
public function testCurrentUrl(string $pattern, string $url, string $basePath, bool $withQueryString)
{
Expand All @@ -138,7 +138,7 @@ public function testCurrentUrl(string $pattern, string $url, string $basePath, b
$uriProphecy = $this->prophesize(UriInterface::class);

$path = parse_url($url, PHP_URL_PATH);
$query = parse_url($url, PHP_URL_QUERY);
$query = parse_url($url, PHP_URL_QUERY) ?? '';

$uriProphecy
->getPath()
Expand Down Expand Up @@ -178,8 +178,8 @@ public function urlForProvider(): array
* @dataProvider urlForProvider
*
* @param string $pattern
* @param array $routeData
* @param array $queryParams
* @param array $routeData
* @param array $queryParams
* @param string $basePath
* @param string $expectedUrl
*/
Expand Down Expand Up @@ -224,8 +224,8 @@ public function fullUrlForProvider(): array
* @dataProvider fullUrlForProvider
*
* @param string $pattern
* @param array $routeData
* @param array $queryParams
* @param array $routeData
* @param array $queryParams
* @param string $basePath
* @param string $expectedFullUrl
*/
Expand Down

0 comments on commit 1b35153

Please sign in to comment.