Fix newly discovered psalm issues

netglue · May 4, 2023 · 30bc107 · 30bc107
1 parent d335b29
commit 30bc107
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
+<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
   <file src="src/Event/WebhookEvent.php">
     <MixedAssignment occurrences="2">
       <code>$this-&gt;payload</code>
@@ -15,9 +15,6 @@
     <MixedArrayAccess occurrences="1">
       <code>$options['defaults'][$this-&gt;routeParams-&gt;reuseResultParams()]</code>
     </MixedArrayAccess>
-    <MixedAssignment occurrences="1">
-      <code>$reuseResultParams</code>
-    </MixedAssignment>
   </file>
   <file src="src/Middleware/Container/ExpiredPreviewHandlerFactory.php">
     <MixedArgument occurrences="1">

diff --git 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
@@ -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
@@ -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]);
         }