Update and use Validation class

1 files changed, 2 insertions, 5 deletions

diff --git a/app/Http/RequestHandlers/MergeRecordsPage.php b/app/Http/RequestHandlers/MergeRecordsPage.php
index ea73093757..99521c5ae3 100644
--- a/app/Http/RequestHandlers/MergeRecordsPage.php
+++ b/app/Http/RequestHandlers/MergeRecordsPage.php
@@ -30,12 +30,11 @@ use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Repository;
 use Fisharebest\Webtrees\Source;
 use Fisharebest\Webtrees\Submitter;
-use Fisharebest\Webtrees\Tree;
+use Fisharebest\Webtrees\Validator;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-use function assert;
 use function e;
 
 /**
@@ -56,9 +55,7 @@ class MergeRecordsPage implements RequestHandlerInterface
     {
         $this->layout = 'layouts/administration';
 
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
+        $tree  = Validator::attributes($request)->tree();
         $xref1 = $request->getQueryParams()['xref1'] ?? '';
         $xref2 = $request->getQueryParams()['xref2'] ?? '';