PHPdoc; assertions

1 files changed, 11 insertions, 4 deletions

diff --git a/app/Http/RequestHandlers/RedirectNotePhp.php b/app/Http/RequestHandlers/RedirectNotePhp.php
index 003cb1866b..941c4c664f 100644
--- a/app/Http/RequestHandlers/RedirectNotePhp.php
+++ b/app/Http/RequestHandlers/RedirectNotePhp.php
@@ -19,10 +19,13 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\StatusCodeInterface;
+use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+use function assert;
+use function is_string;
 use function redirect;
 use function route;
 
@@ -38,10 +41,14 @@ class RedirectNotePhp implements RequestHandlerInterface
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $tree   = $request->getQueryParams()['ged'] ?? '';
-        $xref  = $request->getQueryParams()['nid'] ?? '';
-        $route = route('note', ['tree' => $tree, 'xref' => $xref]);
+        $tree = $request->getQueryParams()['ged'];
+        assert(is_string($tree), new InvalidArgumentException());
 
-        return redirect($route, StatusCodeInterface::STATUS_MOVED_PERMANENTLY);
+        $xref = $request->getQueryParams()['nid'] ?? '';
+        assert(is_string($xref), new InvalidArgumentException());
+
+        $url = route('note', ['tree' => $tree, 'xref' => $xref]);
+
+        return redirect($url, StatusCodeInterface::STATUS_MOVED_PERMANENTLY);
     }
 }