Fix: #4873 - Add Link/rel=canonical to genealogy pages and redirects

29 files changed, 82 insertions, 82 deletions

diff --git a/tests/app/Http/RequestHandlers/RedirectAncestryPhpTest.php b/tests/app/Http/RequestHandlers/RedirectAncestryPhpTest.php
index d83e3600c7..d7bd87e820 100644
--- a/tests/app/Http/RequestHandlers/RedirectAncestryPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectAncestryPhpTest.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Module\AncestorsChartModule;
 use Fisharebest\Webtrees\Registry;
@@ -112,7 +112,7 @@ class RedirectAncestryPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -141,7 +141,7 @@ class RedirectAncestryPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php b/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php
index d22ea59bb8..d393b36771 100644
--- a/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Module\BranchesListModule;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -100,7 +100,7 @@ class RedirectBranchesPhpTest extends TestCase
             ['ged' => 'tree1', 'surname' => 'XYZ']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -129,7 +129,7 @@ class RedirectBranchesPhpTest extends TestCase
             ['ged' => 'tree1', 'surname' => 'XYZ']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectCalendarPhpTest.php b/tests/app/Http/RequestHandlers/RedirectCalendarPhpTest.php
index 3c43256098..a72f00779e 100644
--- a/tests/app/Http/RequestHandlers/RedirectCalendarPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectCalendarPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -78,7 +78,7 @@ class RedirectCalendarPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectCompactPhpTest.php b/tests/app/Http/RequestHandlers/RedirectCompactPhpTest.php
index 705c3a5cb0..af619b3af1 100644
--- a/tests/app/Http/RequestHandlers/RedirectCompactPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectCompactPhpTest.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Module\CompactTreeChartModule;
 use Fisharebest\Webtrees\Registry;
@@ -112,7 +112,7 @@ class RedirectCompactPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -141,7 +141,7 @@ class RedirectCompactPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php b/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php
index 1d1df605c0..72190f3388 100644
--- a/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Module\DescendancyChartModule;
 use Fisharebest\Webtrees\Registry;
@@ -108,7 +108,7 @@ class RedirectDescendancyPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -137,7 +137,7 @@ class RedirectDescendancyPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectFamListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectFamListPhpTest.php
index 5583b0d557..0ecc41638b 100644
--- a/tests/app/Http/RequestHandlers/RedirectFamListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectFamListPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Module\FamilyListModule;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -92,7 +92,7 @@ class RedirectFamListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -118,7 +118,7 @@ class RedirectFamListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php b/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php
index 3e44db2c1e..fddf107ea4 100644
--- a/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Module\FamilyBookChartModule;
 use Fisharebest\Webtrees\Registry;
@@ -107,7 +107,7 @@ class RedirectFamilyBookPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -136,7 +136,7 @@ class RedirectFamilyBookPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectFamilyPhpTest.php b/tests/app/Http/RequestHandlers/RedirectFamilyPhpTest.php
index a4094d1542..25b1a02ebf 100644
--- a/tests/app/Http/RequestHandlers/RedirectFamilyPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectFamilyPhpTest.php
@@ -24,7 +24,7 @@ use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\FamilyFactory;
 use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\TestCase;
@@ -95,7 +95,7 @@ class RedirectFamilyPhpTest extends TestCase
             ['ged' => 'tree1', 'famid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectFanChartPhpTest.php b/tests/app/Http/RequestHandlers/RedirectFanChartPhpTest.php
index 2b599ac2d4..c585e829f7 100644
--- a/tests/app/Http/RequestHandlers/RedirectFanChartPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectFanChartPhpTest.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Module\FanChartModule;
 use Fisharebest\Webtrees\Registry;
@@ -112,7 +112,7 @@ class RedirectFanChartPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -141,7 +141,7 @@ class RedirectFanChartPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectGedRecordPhpTest.php b/tests/app/Http/RequestHandlers/RedirectGedRecordPhpTest.php
index 7d8371e390..0fc0c39fa3 100644
--- a/tests/app/Http/RequestHandlers/RedirectGedRecordPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectGedRecordPhpTest.php
@@ -24,7 +24,7 @@ use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\GedcomRecordFactory;
 use Fisharebest\Webtrees\GedcomRecord;
 use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\TestCase;
@@ -95,7 +95,7 @@ class RedirectGedRecordPhpTest extends TestCase
             ['ged' => 'tree1', 'pid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectHourGlassPhpTest.php b/tests/app/Http/RequestHandlers/RedirectHourGlassPhpTest.php
index 908c009efa..63ec4911f5 100644
--- a/tests/app/Http/RequestHandlers/RedirectHourGlassPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectHourGlassPhpTest.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Module\HourglassChartModule;
 use Fisharebest\Webtrees\Registry;
@@ -112,7 +112,7 @@ class RedirectHourGlassPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -141,7 +141,7 @@ class RedirectHourGlassPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php
index 1408a6b49d..eff4bc6b10 100644
--- a/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Module\IndividualListModule;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -92,7 +92,7 @@ class RedirectIndiListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -118,7 +118,7 @@ class RedirectIndiListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php b/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php
index f681cfe917..a02624fc0c 100644
--- a/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php
@@ -23,7 +23,7 @@ use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
 use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -95,7 +95,7 @@ class RedirectIndividualPhpTest extends TestCase
             ['ged' => 'tree1', 'pid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -115,7 +115,7 @@ class RedirectIndividualPhpTest extends TestCase
             ['ged' => 'tree1', 'pid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectLifeSpanPhpTest.php b/tests/app/Http/RequestHandlers/RedirectLifeSpanPhpTest.php
index 4a03f3fd66..e137d5aaf8 100644
--- a/tests/app/Http/RequestHandlers/RedirectLifeSpanPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectLifeSpanPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Module\LifespansChartModule;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -98,7 +98,7 @@ class RedirectLifeSpanPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -127,7 +127,7 @@ class RedirectLifeSpanPhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php
index 02d6fb7bef..1a5fddd898 100644
--- a/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Module\MediaListModule;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -92,7 +92,7 @@ class RedirectMediaListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -118,7 +118,7 @@ class RedirectMediaListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php b/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php
index d0df853cb1..a8bf195bb7 100644
--- a/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php
@@ -23,7 +23,7 @@ use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\MediaFactory;
 use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Media;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -95,7 +95,7 @@ class RedirectMediaViewerPhpTest extends TestCase
             ['ged' => 'tree1', 'mid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -115,7 +115,7 @@ class RedirectMediaViewerPhpTest extends TestCase
             ['ged' => 'tree1', 'mid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectModulePhpTest.php b/tests/app/Http/RequestHandlers/RedirectModulePhpTest.php
index 74b9447031..bd621f878e 100644
--- a/tests/app/Http/RequestHandlers/RedirectModulePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectModulePhpTest.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Module\InteractiveTreeModule;
 use Fisharebest\Webtrees\Module\PedigreeMapModule;
@@ -157,7 +157,7 @@ class RedirectModulePhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -191,7 +191,7 @@ class RedirectModulePhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -234,7 +234,7 @@ class RedirectModulePhpTest extends TestCase
             ['mod' => 'googlemap', 'mod_action' => 'pedigree_map', 'ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -277,7 +277,7 @@ class RedirectModulePhpTest extends TestCase
             ['mod' => 'tree', 'mod_action' => 'treeview', 'ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php
index 456c069e6f..5dad1ddd98 100644
--- a/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Module\NoteListModule;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -92,7 +92,7 @@ class RedirectNoteListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -118,7 +118,7 @@ class RedirectNoteListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php b/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php
index d08fe27a4a..ccafe3cf6d 100644
--- a/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php
@@ -23,7 +23,7 @@ use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\NoteFactory;
 use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Note;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -95,7 +95,7 @@ class RedirectNotePhpTest extends TestCase
             ['ged' => 'tree1', 'nid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php b/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php
index 78b2627083..bbe6394567 100644
--- a/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Module\PedigreeChartModule;
 use Fisharebest\Webtrees\Registry;
@@ -112,7 +112,7 @@ class RedirectPedigreePhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -141,7 +141,7 @@ class RedirectPedigreePhpTest extends TestCase
             ['ged' => 'tree1', 'rootid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php
index 5e928868e6..a567d61cb4 100644
--- a/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Module\PlaceHierarchyListModule;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -92,7 +92,7 @@ class RedirectPlaceListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -118,7 +118,7 @@ class RedirectPlaceListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php b/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php
index ab153de190..f0f5ab45cd 100644
--- a/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Module\RelationshipsChartModule;
 use Fisharebest\Webtrees\Registry;
@@ -112,7 +112,7 @@ class RedirectRelationshipPhpTest extends TestCase
             ['ged' => 'tree1', 'pid1' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -141,7 +141,7 @@ class RedirectRelationshipPhpTest extends TestCase
             ['ged' => 'tree1', 'pid1' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php
index 62a819d450..1dfdf212e0 100644
--- a/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Module\RepositoryListModule;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -92,7 +92,7 @@ class RedirectRepoListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -118,7 +118,7 @@ class RedirectRepoListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectReportEnginePhpTest.php b/tests/app/Http/RequestHandlers/RedirectReportEnginePhpTest.php
index 67a6c9de9b..0df6579222 100644
--- a/tests/app/Http/RequestHandlers/RedirectReportEnginePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectReportEnginePhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -81,7 +81,7 @@ class RedirectReportEnginePhpTest extends TestCase
             ['ged'    => 'tree1', 'action' => 'run', 'report' => 'foo/report.xml']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php b/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php
index d6ae8ddd1e..07d13da06f 100644
--- a/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php
@@ -23,7 +23,7 @@ use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\RepositoryFactory;
 use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Repository;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -95,7 +95,7 @@ class RedirectRepositoryPhpTest extends TestCase
             ['ged' => 'tree1', 'rid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php
index 0eb23b0d1a..6d7e134722 100644
--- a/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Module\SourceListModule;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -92,7 +92,7 @@ class RedirectSourceListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -118,7 +118,7 @@ class RedirectSourceListPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php b/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php
index 3a2bc211ba..5844f41c59 100644
--- a/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php
@@ -23,7 +23,7 @@ use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\SourceFactory;
 use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\Source;
@@ -95,7 +95,7 @@ class RedirectSourcePhpTest extends TestCase
             ['ged' => 'tree1', 'sid' => 'X123']
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php b/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php
index 33be8d9c99..5de33752ae 100644
--- a/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php
@@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Module\StatisticsChartModule;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -92,7 +92,7 @@ class RedirectStatisticsPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -118,7 +118,7 @@ class RedirectStatisticsPhpTest extends TestCase
 
         $request = self::createRequest(RequestMethodInterface::METHOD_GET, ['ged' => 'tree1']);
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php b/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php
index 8abc4b661a..47a7e32d45 100644
--- a/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Factories\IndividualFactory;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Module\TimelineChartModule;
 use Fisharebest\Webtrees\Registry;
@@ -112,7 +112,7 @@ class RedirectTimeLinePhpTest extends TestCase
             ['ged' => 'tree1', 'pids' => ['X123']]
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }
@@ -141,7 +141,7 @@ class RedirectTimeLinePhpTest extends TestCase
             ['ged' => 'tree1', 'pids' => ['X123']]
         );
 
-        $this->expectException(HttpNotFoundException::class);
+        $this->expectException(HttpGoneException::class);
 
         $handler->handle($request);
     }