diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2022-02-22 11:28:26 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2022-02-23 10:22:28 +0000 |
| commit | b55cbc6b43247e8b2ad14af6f6d24dc6747195ff (patch) | |
| tree | 7c48ed3c99e4c7887dee5e923035c862fdff92cd /app/Http/RequestHandlers/MergeRecordsAction.php | |
| parent | 709c7e1a4da00208ea2ab538eb0a1f2d46f63629 (diff) | |
| download | webtrees-b55cbc6b43247e8b2ad14af6f6d24dc6747195ff.tar.gz webtrees-b55cbc6b43247e8b2ad14af6f6d24dc6747195ff.tar.bz2 webtrees-b55cbc6b43247e8b2ad14af6f6d24dc6747195ff.zip | |
Update and use Validation class
Diffstat (limited to 'app/Http/RequestHandlers/MergeRecordsAction.php')
| -rw-r--r-- | app/Http/RequestHandlers/MergeRecordsAction.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/Http/RequestHandlers/MergeRecordsAction.php b/app/Http/RequestHandlers/MergeRecordsAction.php index d33e62d703..82dae6e3cd 100644 --- a/app/Http/RequestHandlers/MergeRecordsAction.php +++ b/app/Http/RequestHandlers/MergeRecordsAction.php @@ -20,12 +20,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fisharebest\Webtrees\Registry; -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 redirect; use function route; @@ -41,8 +40,7 @@ class MergeRecordsAction implements RequestHandlerInterface */ public function handle(ServerRequestInterface $request): ResponseInterface { - $tree = $request->getAttribute('tree'); - assert($tree instanceof Tree); + $tree = Validator::attributes($request)->tree(); $params = (array) $request->getParsedBody(); |
