diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 8a180ab..5827b5a 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + $this->payload @@ -15,9 +15,6 @@ $options['defaults'][$this->routeParams->reuseResultParams()] - - $reuseResultParams - diff --git a/src/LinkResolver.php b/src/LinkResolver.php index dace349..e433b08 100644 --- a/src/LinkResolver.php +++ b/src/LinkResolver.php @@ -14,6 +14,9 @@ use Prismic\UrlLink; use Prismic\Value\Bookmark; +use function assert; +use function is_bool; + /** @psalm-suppress DeprecatedClass, DeprecatedMethod, DeprecatedProperty */ final class LinkResolver implements PrismicLinkResolver { @@ -95,6 +98,7 @@ private function url(DocumentLink $link, Route $route): string { $options = $route->getOptions(); $reuseResultParams = $options['defaults'][$this->routeParams->reuseResultParams()] ?? true; + assert(is_bool($reuseResultParams)); return $this->urlHelper->generate( $route->getName(), diff --git a/test/Unit/Middleware/DocumentResolverTest.php b/test/Unit/Middleware/DocumentResolverTest.php index 7519c31..03e5af2 100644 --- a/test/Unit/Middleware/DocumentResolverTest.php +++ b/test/Unit/Middleware/DocumentResolverTest.php @@ -53,7 +53,7 @@ public function testAnExceptionIsThrownWhenThereIsNoRouteResultAvailable(): void { $subject = new DocumentResolver($this->resolver); $this->expectException(RequestError::class); - $this->expectDeprecationMessage('The request for /foo failed because the route result was not available.'); + $this->expectExceptionMessage('The request for /foo failed because the route result was not available.'); $subject->process($this->request, $this->handler); } diff --git a/test/Unit/Router/RouteMatcherTest.php b/test/Unit/Router/RouteMatcherTest.php index c740f0d..641d627 100644 --- a/test/Unit/Router/RouteMatcherTest.php +++ b/test/Unit/Router/RouteMatcherTest.php @@ -17,6 +17,8 @@ use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; +use function assert; + /** @psalm-suppress DeprecatedMethod */ class RouteMatcherTest extends TestCase { @@ -192,6 +194,7 @@ private function routeMatchingProvider(): array private function loadRoutes(): void { foreach ($this->routeMatchingProvider() as $name => $defaults) { + assert($name !== ''); $route = $this->collector->get('/' . $name, $this->middleware, $name); $route->setOptions(['defaults' => $defaults]); }