Use new validator class

1 files changed, 7 insertions, 8 deletions

diff --git a/app/Http/RequestHandlers/PendingChanges.php b/app/Http/RequestHandlers/PendingChanges.php
index d3ebe49716..f05b8f995f 100644
--- a/app/Http/RequestHandlers/PendingChanges.php
+++ b/app/Http/RequestHandlers/PendingChanges.php
@@ -58,14 +58,13 @@ class PendingChanges implements RequestHandlerInterface
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $tree = Validator::attributes($request)->tree();
-
-        $n = (int) ($request->getQueryParams()['n'] ?? self::MAX_CHANGES);
-
-        $url     = $request->getQueryParams()['url'] ?? route(TreePage::class, ['tree' => $tree->name()]);
-        $xrefs   = $this->pending_changes_service->pendingXrefs($tree);
-        $changes = $this->pending_changes_service->pendingChanges($tree, $n);
-        $title   = I18N::translate('Pending changes');
+        $tree        = Validator::attributes($request)->tree();
+        $n           = Validator::queryParams($request)->integer('n', self::MAX_CHANGES);
+        $default_url = route(TreePage::class, ['tree' => $tree->name()]);
+        $url         = Validator::queryParams($request)->isLocalUrl()->string('url', $default_url);
+        $xrefs       = $this->pending_changes_service->pendingXrefs($tree);
+        $changes     = $this->pending_changes_service->pendingChanges($tree, $n);
+        $title       = I18N::translate('Pending changes');
 
         return $this->viewResponse('pending-changes-page', [
             'changes' => $changes,