diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2023-07-26 21:22:17 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2023-08-29 11:31:13 +0100 |
| commit | 6f4ec3cadc983f0a7294108c634bef48846b4311 (patch) | |
| tree | c18e488a228bb9913201a24cff99f3e3ec89c207 | |
| parent | 185ccc3f554c22bf4be9fcd78880780666043f63 (diff) | |
| download | webtrees-6f4ec3cadc983f0a7294108c634bef48846b4311.tar.gz webtrees-6f4ec3cadc983f0a7294108c634bef48846b4311.tar.bz2 webtrees-6f4ec3cadc983f0a7294108c634bef48846b4311.zip | |
Preparing to remove dependency on laravel/database
153 files changed, 182 insertions, 164 deletions
diff --git a/app/DB.php b/app/DB.php new file mode 100644 index 0000000000..1a3a208e35 --- /dev/null +++ b/app/DB.php @@ -0,0 +1,44 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2023 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +declare(strict_types=1); + +namespace Fisharebest\Webtrees; + +use Illuminate\Database\Capsule\Manager; + +/** + * Database abstraction + */ +class DB extends Manager +{ + /** + * @internal + */ + public static function caseInsensitiveLikeOperator(): string + { + if (DB::connection()->getDriverName() === 'pgsql') { + return 'ILIKE'; + } + + if (DB::connection()->getDriverName() === 'sqlsrv') { + return 'COLLATE SQL_UTF8_General_CI_AI LIKE'; + } + + return 'LIKE'; + } +} diff --git a/app/Factories/AbstractGedcomRecordFactory.php b/app/Factories/AbstractGedcomRecordFactory.php index c725911af8..6f73b388b4 100644 --- a/app/Factories/AbstractGedcomRecordFactory.php +++ b/app/Factories/AbstractGedcomRecordFactory.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Factories; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use function str_starts_with; diff --git a/app/Factories/FamilyFactory.php b/app/Factories/FamilyFactory.php index e97d112a19..ac0259a9e7 100644 --- a/app/Factories/FamilyFactory.php +++ b/app/Factories/FamilyFactory.php @@ -21,11 +21,11 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\FamilyFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function preg_match; diff --git a/app/Factories/GedcomRecordFactory.php b/app/Factories/GedcomRecordFactory.php index 6bd956d70b..875ec196dd 100644 --- a/app/Factories/GedcomRecordFactory.php +++ b/app/Factories/GedcomRecordFactory.php @@ -21,6 +21,7 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\GedcomRecordFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\GedcomRecord; @@ -35,7 +36,6 @@ use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Submission; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use InvalidArgumentException; /** diff --git a/app/Factories/HeaderFactory.php b/app/Factories/HeaderFactory.php index 23f82b494d..e0808629c5 100644 --- a/app/Factories/HeaderFactory.php +++ b/app/Factories/HeaderFactory.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\HeaderFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Header; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function preg_match; diff --git a/app/Factories/IndividualFactory.php b/app/Factories/IndividualFactory.php index 51158894c1..ee9aea9bac 100644 --- a/app/Factories/IndividualFactory.php +++ b/app/Factories/IndividualFactory.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\IndividualFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function preg_match; diff --git a/app/Factories/LocationFactory.php b/app/Factories/LocationFactory.php index c7f1827bb2..9cc0054289 100644 --- a/app/Factories/LocationFactory.php +++ b/app/Factories/LocationFactory.php @@ -21,11 +21,10 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\LocationFactoryInterface; -use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Location; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function preg_match; diff --git a/app/Factories/MediaFactory.php b/app/Factories/MediaFactory.php index e9a3794435..177a8aacaa 100644 --- a/app/Factories/MediaFactory.php +++ b/app/Factories/MediaFactory.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\MediaFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Media; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function preg_match; diff --git a/app/Factories/NoteFactory.php b/app/Factories/NoteFactory.php index b34880460f..c678c48242 100644 --- a/app/Factories/NoteFactory.php +++ b/app/Factories/NoteFactory.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\NoteFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Note; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function preg_match; diff --git a/app/Factories/RepositoryFactory.php b/app/Factories/RepositoryFactory.php index 98b4673c40..60bc75e9fb 100644 --- a/app/Factories/RepositoryFactory.php +++ b/app/Factories/RepositoryFactory.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\RepositoryFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function assert; use function preg_match; diff --git a/app/Factories/SharedNoteFactory.php b/app/Factories/SharedNoteFactory.php index 44ab1ce8e4..ada5b8e294 100644 --- a/app/Factories/SharedNoteFactory.php +++ b/app/Factories/SharedNoteFactory.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\SharedNoteFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\SharedNote; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function preg_match; diff --git a/app/Factories/SourceFactory.php b/app/Factories/SourceFactory.php index 0e00b03510..2c1193452a 100644 --- a/app/Factories/SourceFactory.php +++ b/app/Factories/SourceFactory.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\SourceFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function preg_match; diff --git a/app/Factories/SubmissionFactory.php b/app/Factories/SubmissionFactory.php index 60da0486b1..4af0fd81d3 100644 --- a/app/Factories/SubmissionFactory.php +++ b/app/Factories/SubmissionFactory.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\SubmissionFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Submission; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function preg_match; diff --git a/app/Factories/SubmitterFactory.php b/app/Factories/SubmitterFactory.php index 3795f182fa..8518c00aea 100644 --- a/app/Factories/SubmitterFactory.php +++ b/app/Factories/SubmitterFactory.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\SubmitterFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function preg_match; diff --git a/app/Factories/XrefFactory.php b/app/Factories/XrefFactory.php index db3443333c..41aefcebeb 100644 --- a/app/Factories/XrefFactory.php +++ b/app/Factories/XrefFactory.php @@ -20,8 +20,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Factories; use Fisharebest\Webtrees\Contracts\XrefFactoryInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Site; -use Illuminate\Database\Capsule\Manager as DB; /** * Make an XREF. diff --git a/app/Family.php b/app/Family.php index fe0f400b11..1f51bdccdb 100644 --- a/app/Family.php +++ b/app/Family.php @@ -21,7 +21,6 @@ namespace Fisharebest\Webtrees; use Closure; use Fisharebest\Webtrees\Http\RequestHandlers\FamilyPage; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; /** diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php index d871d579b2..faa3d6c6f4 100644 --- a/app/GedcomRecord.php +++ b/app/GedcomRecord.php @@ -26,7 +26,6 @@ use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Elements\RestrictionNotice; use Fisharebest\Webtrees\Http\RequestHandlers\GedcomRecordPage; use Fisharebest\Webtrees\Services\PendingChangesService; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use function array_combine; diff --git a/app/Http/Middleware/UseDatabase.php b/app/Http/Middleware/UseDatabase.php index aa53377fd9..2e7a2b5b47 100644 --- a/app/Http/Middleware/UseDatabase.php +++ b/app/Http/Middleware/UseDatabase.php @@ -19,9 +19,9 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\Middleware; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Validator; use Fisharebest\Webtrees\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; use PDO; use PDOException; use Psr\Http\Message\ResponseInterface; diff --git a/app/Http/Middleware/UseTransaction.php b/app/Http/Middleware/UseTransaction.php index 0d9f3fddb0..20f010d9a1 100644 --- a/app/Http/Middleware/UseTransaction.php +++ b/app/Http/Middleware/UseTransaction.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\Middleware; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; diff --git a/app/Http/RequestHandlers/AbstractModuleComponentAction.php b/app/Http/RequestHandlers/AbstractModuleComponentAction.php index 88e36dd20c..b0d529958e 100644 --- a/app/Http/RequestHandlers/AbstractModuleComponentAction.php +++ b/app/Http/RequestHandlers/AbstractModuleComponentAction.php @@ -19,14 +19,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Module\ModuleInterface; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; -use Illuminate\Support\Collection; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/AutoCompleteCitation.php b/app/Http/RequestHandlers/AutoCompleteCitation.php index 92866d81ff..9da6711ea3 100644 --- a/app/Http/RequestHandlers/AutoCompleteCitation.php +++ b/app/Http/RequestHandlers/AutoCompleteCitation.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Http/RequestHandlers/CheckTree.php b/app/Http/RequestHandlers/CheckTree.php index 461fcbe087..f9587a63a7 100644 --- a/app/Http/RequestHandlers/CheckTree.php +++ b/app/Http/RequestHandlers/CheckTree.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Elements\AbstractXrefElement; use Fisharebest\Webtrees\Elements\MultimediaFileReference; use Fisharebest\Webtrees\Elements\MultimediaFormat; @@ -52,7 +53,6 @@ use Fisharebest\Webtrees\Submission; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Http/RequestHandlers/ControlPanel.php b/app/Http/RequestHandlers/ControlPanel.php index 8a2c6279fb..4157f992ef 100644 --- a/app/Http/RequestHandlers/ControlPanel.php +++ b/app/Http/RequestHandlers/ControlPanel.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Module\FamilyListModule; @@ -60,7 +61,6 @@ use Fisharebest\Webtrees\Services\UpgradeService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/app/Http/RequestHandlers/FixLevel0MediaData.php b/app/Http/RequestHandlers/FixLevel0MediaData.php index 6a19db2eb7..d32013c942 100644 --- a/app/Http/RequestHandlers/FixLevel0MediaData.php +++ b/app/Http/RequestHandlers/FixLevel0MediaData.php @@ -19,13 +19,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\DatatablesService; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/app/Http/RequestHandlers/GedcomLoad.php b/app/Http/RequestHandlers/GedcomLoad.php index b0ebe29f66..ca1d050747 100644 --- a/app/Http/RequestHandlers/GedcomLoad.php +++ b/app/Http/RequestHandlers/GedcomLoad.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Exception; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Encodings\UTF8; use Fisharebest\Webtrees\Exceptions\GedcomErrorException; use Fisharebest\Webtrees\Http\ViewResponseTrait; @@ -27,7 +28,6 @@ use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Services\GedcomImportService; use Fisharebest\Webtrees\Services\TimeoutService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\DetectsConcurrencyErrors; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Http/RequestHandlers/ManageMediaData.php b/app/Http/RequestHandlers/ManageMediaData.php index a1cd6bb403..5d38e065b5 100644 --- a/app/Http/RequestHandlers/ManageMediaData.php +++ b/app/Http/RequestHandlers/ManageMediaData.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Media; @@ -29,7 +30,6 @@ use Fisharebest\Webtrees\Services\LinkedRecordService; use Fisharebest\Webtrees\Services\MediaFileService; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; diff --git a/app/Http/RequestHandlers/MapDataExportCSV.php b/app/Http/RequestHandlers/MapDataExportCSV.php index c67445fff2..c2bd735799 100644 --- a/app/Http/RequestHandlers/MapDataExportCSV.php +++ b/app/Http/RequestHandlers/MapDataExportCSV.php @@ -19,9 +19,9 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\PlaceLocation; use Fisharebest\Webtrees\Services\MapDataService; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/MapDataExportGeoJson.php b/app/Http/RequestHandlers/MapDataExportGeoJson.php index c71dee6e15..8d6560e0cb 100644 --- a/app/Http/RequestHandlers/MapDataExportGeoJson.php +++ b/app/Http/RequestHandlers/MapDataExportGeoJson.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\PlaceLocation; use Fisharebest\Webtrees\Services\MapDataService; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/MapDataImportAction.php b/app/Http/RequestHandlers/MapDataImportAction.php index 4557488f57..8176f39b80 100644 --- a/app/Http/RequestHandlers/MapDataImportAction.php +++ b/app/Http/RequestHandlers/MapDataImportAction.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Exception; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Exceptions\FileUploadException; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\Gedcom; @@ -28,7 +29,6 @@ use Fisharebest\Webtrees\PlaceLocation; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\MapDataService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\StreamFactoryInterface; diff --git a/app/Http/RequestHandlers/MapDataSave.php b/app/Http/RequestHandlers/MapDataSave.php index d89d69aa7f..a43d1220a6 100644 --- a/app/Http/RequestHandlers/MapDataSave.php +++ b/app/Http/RequestHandlers/MapDataSave.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/MergeFactsAction.php b/app/Http/RequestHandlers/MergeFactsAction.php index 526ee3931f..b319db5aed 100644 --- a/app/Http/RequestHandlers/MergeFactsAction.php +++ b/app/Http/RequestHandlers/MergeFactsAction.php @@ -21,12 +21,12 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\LinkedRecordService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Http/RequestHandlers/MergeTreesAction.php b/app/Http/RequestHandlers/MergeTreesAction.php index 2cd581c7bc..b5eb578eac 100644 --- a/app/Http/RequestHandlers/MergeTreesAction.php +++ b/app/Http/RequestHandlers/MergeTreesAction.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\Header; use Fisharebest\Webtrees\I18N; @@ -26,7 +27,6 @@ use Fisharebest\Webtrees\Services\AdminService; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Psr\Http\Message\ResponseInterface; diff --git a/app/Http/RequestHandlers/ModuleDeleteSettings.php b/app/Http/RequestHandlers/ModuleDeleteSettings.php index 021d93364e..b87c08beaf 100644 --- a/app/Http/RequestHandlers/ModuleDeleteSettings.php +++ b/app/Http/RequestHandlers/ModuleDeleteSettings.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/ModulesAllAction.php b/app/Http/RequestHandlers/ModulesAllAction.php index c5acb16484..fc3722e271 100644 --- a/app/Http/RequestHandlers/ModulesAllAction.php +++ b/app/Http/RequestHandlers/ModulesAllAction.php @@ -19,11 +19,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/PendingChangesLogPage.php b/app/Http/RequestHandlers/PendingChangesLogPage.php index 261f52286d..3dccf6c3d4 100644 --- a/app/Http/RequestHandlers/PendingChangesLogPage.php +++ b/app/Http/RequestHandlers/PendingChangesLogPage.php @@ -19,13 +19,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/RegisterAction.php b/app/Http/RequestHandlers/RegisterAction.php index b92ae830b6..c14798cab4 100644 --- a/app/Http/RequestHandlers/RegisterAction.php +++ b/app/Http/RequestHandlers/RegisterAction.php @@ -21,6 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers; use Exception; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; use Fisharebest\Webtrees\Http\ViewResponseTrait; @@ -38,7 +39,6 @@ use Fisharebest\Webtrees\SiteUser; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\TreeUser; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Str; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Http/RequestHandlers/RenumberTreeAction.php b/app/Http/RequestHandlers/RenumberTreeAction.php index 8bc57c19bb..b169d3fb9d 100644 --- a/app/Http/RequestHandlers/RenumberTreeAction.php +++ b/app/Http/RequestHandlers/RenumberTreeAction.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\I18N; @@ -32,7 +33,6 @@ use Fisharebest\Webtrees\Services\AdminService; use Fisharebest\Webtrees\Services\TimeoutService; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Psr\Http\Message\ResponseInterface; diff --git a/app/Http/RequestHandlers/SearchGeneralPage.php b/app/Http/RequestHandlers/SearchGeneralPage.php index 79c4c3c7d1..372e287b35 100644 --- a/app/Http/RequestHandlers/SearchGeneralPage.php +++ b/app/Http/RequestHandlers/SearchGeneralPage.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\I18N; @@ -32,7 +33,6 @@ use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Site; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Http/RequestHandlers/SetupWizard.php b/app/Http/RequestHandlers/SetupWizard.php index 084a5714b9..1631bdb9d9 100644 --- a/app/Http/RequestHandlers/SetupWizard.php +++ b/app/Http/RequestHandlers/SetupWizard.php @@ -25,6 +25,7 @@ use Fisharebest\Localization\Locale\LocaleEnUs; use Fisharebest\Localization\Locale\LocaleInterface; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Factories\CacheFactory; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\I18N; @@ -37,7 +38,6 @@ use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Session; use Fisharebest\Webtrees\Validator; use Fisharebest\Webtrees\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/SiteLogsPage.php b/app/Http/RequestHandlers/SiteLogsPage.php index 8cdf82813b..cad74ba2c6 100644 --- a/app/Http/RequestHandlers/SiteLogsPage.php +++ b/app/Http/RequestHandlers/SiteLogsPage.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; @@ -27,7 +28,6 @@ use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/TreePage.php b/app/Http/RequestHandlers/TreePage.php index f2ccb80717..5be21750a2 100644 --- a/app/Http/RequestHandlers/TreePage.php +++ b/app/Http/RequestHandlers/TreePage.php @@ -19,11 +19,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\Module\ModuleBlockInterface; use Fisharebest\Webtrees\Services\HomePageService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Psr\Http\Message\ResponseInterface; diff --git a/app/Http/RequestHandlers/TreePageBlock.php b/app/Http/RequestHandlers/TreePageBlock.php index 9fa0a14488..ed5507d7f9 100644 --- a/app/Http/RequestHandlers/TreePageBlock.php +++ b/app/Http/RequestHandlers/TreePageBlock.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Module\ModuleBlockInterface; use Fisharebest\Webtrees\Services\HomePageService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/TreePreferencesAction.php b/app/Http/RequestHandlers/TreePreferencesAction.php index f0d114d5d8..522553cb55 100644 --- a/app/Http/RequestHandlers/TreePreferencesAction.php +++ b/app/Http/RequestHandlers/TreePreferencesAction.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use PDOException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Http/RequestHandlers/TreePrivacyAction.php b/app/Http/RequestHandlers/TreePrivacyAction.php index 670aaef88d..66c8dce20a 100644 --- a/app/Http/RequestHandlers/TreePrivacyAction.php +++ b/app/Http/RequestHandlers/TreePrivacyAction.php @@ -19,11 +19,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/TreePrivacyPage.php b/app/Http/RequestHandlers/TreePrivacyPage.php index 299c58e125..0d99f001db 100644 --- a/app/Http/RequestHandlers/TreePrivacyPage.php +++ b/app/Http/RequestHandlers/TreePrivacyPage.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Elements\UnknownElement; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Http\ViewResponseTrait; @@ -28,7 +29,6 @@ use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/UnconnectedPage.php b/app/Http/RequestHandlers/UnconnectedPage.php index 42543c4d7e..ddeb2d70f9 100644 --- a/app/Http/RequestHandlers/UnconnectedPage.php +++ b/app/Http/RequestHandlers/UnconnectedPage.php @@ -20,12 +20,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fisharebest\Algorithm\ConnectedComponent; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Http/RequestHandlers/UpgradeWizardStep.php b/app/Http/RequestHandlers/UpgradeWizardStep.php index 8d5155f053..759bbc2386 100644 --- a/app/Http/RequestHandlers/UpgradeWizardStep.php +++ b/app/Http/RequestHandlers/UpgradeWizardStep.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\StatusCodeInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\Exceptions\HttpServerErrorException; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; @@ -29,7 +30,6 @@ use Fisharebest\Webtrees\Services\UpgradeService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; use Fisharebest\Webtrees\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Http/RequestHandlers/UserListData.php b/app/Http/RequestHandlers/UserListData.php index 9ab76d0c97..ffdf9abed9 100644 --- a/app/Http/RequestHandlers/UserListData.php +++ b/app/Http/RequestHandlers/UserListData.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Module\ModuleLanguageInterface; use Fisharebest\Webtrees\Registry; @@ -27,7 +28,6 @@ use Fisharebest\Webtrees\Services\DatatablesService; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\JoinClause; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Http/RequestHandlers/UserPage.php b/app/Http/RequestHandlers/UserPage.php index 4f1ff4aa14..6b25ac645f 100644 --- a/app/Http/RequestHandlers/UserPage.php +++ b/app/Http/RequestHandlers/UserPage.php @@ -19,12 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Module\ModuleBlockInterface; use Fisharebest\Webtrees\Services\HomePageService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Psr\Http\Message\ResponseInterface; diff --git a/app/Http/RequestHandlers/UserPageBlock.php b/app/Http/RequestHandlers/UserPageBlock.php index 3939369572..b30b1edc17 100644 --- a/app/Http/RequestHandlers/UserPageBlock.php +++ b/app/Http/RequestHandlers/UserPageBlock.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Module\ModuleBlockInterface; use Fisharebest\Webtrees\Services\HomePageService; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Http/RequestHandlers/VerifyEmail.php b/app/Http/RequestHandlers/VerifyEmail.php index 5f28c68615..f5246b49ac 100644 --- a/app/Http/RequestHandlers/VerifyEmail.php +++ b/app/Http/RequestHandlers/VerifyEmail.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Log; @@ -30,7 +31,6 @@ use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\SiteUser; use Fisharebest\Webtrees\User; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Individual.php b/app/Individual.php index 3f3c5e6851..2f2dedc410 100644 --- a/app/Individual.php +++ b/app/Individual.php @@ -24,7 +24,6 @@ use Fisharebest\ExtCalendar\GregorianCalendar; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Elements\PedigreeLinkageType; use Fisharebest\Webtrees\Http\RequestHandlers\IndividualPage; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use function array_key_exists; diff --git a/app/Log.php b/app/Log.php index 465ed82145..635b745949 100644 --- a/app/Log.php +++ b/app/Log.php @@ -19,7 +19,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ServerRequestInterface; /** diff --git a/app/Media.php b/app/Media.php index 9dcbb79fe5..b6dc61d0fb 100644 --- a/app/Media.php +++ b/app/Media.php @@ -21,7 +21,6 @@ namespace Fisharebest\Webtrees; use Fisharebest\Webtrees\Elements\XrefMedia; use Fisharebest\Webtrees\Http\RequestHandlers\MediaPage; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use function array_filter; diff --git a/app/Module/AbstractModule.php b/app/Module/AbstractModule.php index 7726a4a9e3..4c4911c49d 100644 --- a/app/Module/AbstractModule.php +++ b/app/Module/AbstractModule.php @@ -20,11 +20,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; /** diff --git a/app/Module/BranchesListModule.php b/app/Module/BranchesListModule.php index 4af82afc87..d4f15bb5ce 100644 --- a/app/Module/BranchesListModule.php +++ b/app/Module/BranchesListModule.php @@ -22,6 +22,7 @@ namespace Fisharebest\Webtrees\Module; use Fig\Http\Message\RequestMethodInterface; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Elements\PedigreeLinkageType; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomRecord; @@ -32,7 +33,6 @@ use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Soundex; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\JoinClause; use Psr\Http\Message\ResponseInterface; diff --git a/app/Module/FamilyTreeFavoritesModule.php b/app/Module/FamilyTreeFavoritesModule.php index 2e31f7a478..8c500a1891 100644 --- a/app/Module/FamilyTreeFavoritesModule.php +++ b/app/Module/FamilyTreeFavoritesModule.php @@ -20,13 +20,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Http\RequestHandlers\TreePage; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Str; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Module/FamilyTreeNewsModule.php b/app/Module/FamilyTreeNewsModule.php index 9ae8d52f5c..aad565f3e0 100644 --- a/app/Module/FamilyTreeNewsModule.php +++ b/app/Module/FamilyTreeNewsModule.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\Exceptions\HttpAccessDeniedException; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; use Fisharebest\Webtrees\Http\RequestHandlers\TreePage; @@ -28,7 +29,6 @@ use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\HtmlService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Support\Str; use Psr\Http\Message\ResponseInterface; diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php index 11df173002..eecf42a05e 100644 --- a/app/Module/FamilyTreeStatisticsModule.php +++ b/app/Module/FamilyTreeStatisticsModule.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Registry; @@ -27,14 +28,12 @@ use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Statistics; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Support\Str; use Psr\Http\Message\ServerRequestInterface; use function array_slice; use function extract; -use function var_dump; use function view; use const EXTR_OVERWRITE; diff --git a/app/Module/FixSearchAndReplace.php b/app/Module/FixSearchAndReplace.php index ac2ced72eb..4bc1625a9d 100644 --- a/app/Module/FixSearchAndReplace.php +++ b/app/Module/FixSearchAndReplace.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; @@ -32,7 +33,6 @@ use Fisharebest\Webtrees\Services\DataFixService; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Support\Collection; use Throwable; diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php index 5eb496f704..0cb1f2bdb4 100644 --- a/app/Module/FrequentlyAskedQuestionsModule.php +++ b/app/Module/FrequentlyAskedQuestionsModule.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Menu; @@ -27,7 +28,6 @@ use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Site; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Support\Collection; use Psr\Http\Message\ResponseInterface; diff --git a/app/Module/HitCountFooterModule.php b/app/Module/HitCountFooterModule.php index 80fa9e17ac..f4b3f745ca 100644 --- a/app/Module/HitCountFooterModule.php +++ b/app/Module/HitCountFooterModule.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\RequestHandlers\FamilyPage; use Fisharebest\Webtrees\Http\RequestHandlers\IndividualPage; use Fisharebest\Webtrees\Http\RequestHandlers\MediaPage; @@ -32,7 +33,6 @@ use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Session; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; diff --git a/app/Module/IndividualListModule.php b/app/Module/IndividualListModule.php index e106e359e7..61132a0a28 100644 --- a/app/Module/IndividualListModule.php +++ b/app/Module/IndividualListModule.php @@ -21,7 +21,7 @@ namespace Fisharebest\Webtrees\Module; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; @@ -29,7 +29,6 @@ use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Session; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; diff --git a/app/Module/LifespansChartModule.php b/app/Module/LifespansChartModule.php index 6378534a51..31a2e0d186 100644 --- a/app/Module/LifespansChartModule.php +++ b/app/Module/LifespansChartModule.php @@ -24,13 +24,13 @@ use Fisharebest\ExtCalendar\GregorianCalendar; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\ColorGenerator; use Fisharebest\Webtrees\Date; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\JoinClause; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Module/LocationListModule.php b/app/Module/LocationListModule.php index 252c84c8b4..2f048da6a7 100644 --- a/app/Module/LocationListModule.php +++ b/app/Module/LocationListModule.php @@ -20,13 +20,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Location; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Module/MediaListModule.php b/app/Module/MediaListModule.php index 908d805d62..83ec2342c5 100644 --- a/app/Module/MediaListModule.php +++ b/app/Module/MediaListModule.php @@ -21,6 +21,7 @@ namespace Fisharebest\Webtrees\Module; use Fig\Http\Message\RequestMethodInterface; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Media; @@ -28,7 +29,6 @@ use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\LinkedRecordService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/app/Module/ModuleDataFixTrait.php b/app/Module/ModuleDataFixTrait.php index f877421457..796d6623e2 100644 --- a/app/Module/ModuleDataFixTrait.php +++ b/app/Module/ModuleDataFixTrait.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Individual; @@ -29,7 +30,6 @@ use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Support\Collection; diff --git a/app/Module/NoteListModule.php b/app/Module/NoteListModule.php index d6153e5561..ea3aa6bfdc 100644 --- a/app/Module/NoteListModule.php +++ b/app/Module/NoteListModule.php @@ -20,13 +20,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Note; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Module/PlaceHierarchyListModule.php b/app/Module/PlaceHierarchyListModule.php index 176b4092b9..eabfefad0f 100644 --- a/app/Module/PlaceHierarchyListModule.php +++ b/app/Module/PlaceHierarchyListModule.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Http\RequestHandlers\MapDataEdit; use Fisharebest\Webtrees\I18N; @@ -33,7 +34,6 @@ use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\SearchService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\JoinClause; use Psr\Http\Message\ResponseInterface; diff --git a/app/Module/RecentChangesModule.php b/app/Module/RecentChangesModule.php index 20be9b2d07..713dee36ab 100644 --- a/app/Module/RecentChangesModule.php +++ b/app/Module/RecentChangesModule.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; @@ -28,7 +29,6 @@ use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/app/Module/RelationshipsChartModule.php b/app/Module/RelationshipsChartModule.php index c1159ac6c7..31c289ed64 100644 --- a/app/Module/RelationshipsChartModule.php +++ b/app/Module/RelationshipsChartModule.php @@ -24,18 +24,17 @@ use Fig\Http\Message\RequestMethodInterface; use Fisharebest\Algorithm\Dijkstra; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Menu; use Fisharebest\Webtrees\Registry; -use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\RelationshipService; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; use Psr\Http\Message\ResponseInterface; diff --git a/app/Module/RepositoryListModule.php b/app/Module/RepositoryListModule.php index cf7aef4049..0ea30273a2 100644 --- a/app/Module/RepositoryListModule.php +++ b/app/Module/RepositoryListModule.php @@ -20,13 +20,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php index 144b6b587c..3bd726bdbb 100644 --- a/app/Module/ResearchTaskModule.php +++ b/app/Module/ResearchTaskModule.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Elements\DateValueToday; use Fisharebest\Webtrees\Elements\NoteStructure; use Fisharebest\Webtrees\Elements\ResearchTask; @@ -31,7 +32,6 @@ use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; use Illuminate\Support\Str; diff --git a/app/Module/ReviewChangesModule.php b/app/Module/ReviewChangesModule.php index 993af4937d..c8895b90ea 100644 --- a/app/Module/ReviewChangesModule.php +++ b/app/Module/ReviewChangesModule.php @@ -21,6 +21,7 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChanges; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; @@ -33,7 +34,6 @@ use Fisharebest\Webtrees\SiteUser; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\TreeUser; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Support\Str; diff --git a/app/Module/SiteMapModule.php b/app/Module/SiteMapModule.php index bdd27abc17..316ea8e510 100644 --- a/app/Module/SiteMapModule.php +++ b/app/Module/SiteMapModule.php @@ -21,6 +21,7 @@ namespace Fisharebest\Webtrees\Module; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\GedcomRecord; @@ -37,7 +38,6 @@ use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Support\Collection; use Psr\Http\Message\ResponseInterface; diff --git a/app/Module/SlideShowModule.php b/app/Module/SlideShowModule.php index dfe6ab433a..7e9a3ec4f1 100644 --- a/app/Module/SlideShowModule.php +++ b/app/Module/SlideShowModule.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Elements\SourceMediaType; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Media; @@ -26,7 +27,6 @@ use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\LinkedRecordService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Str; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Module/SourceListModule.php b/app/Module/SourceListModule.php index 1f6df8f32e..e69b6a4e4a 100644 --- a/app/Module/SourceListModule.php +++ b/app/Module/SourceListModule.php @@ -20,12 +20,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Module/StoriesModule.php b/app/Module/StoriesModule.php index fa59d1aac5..030d958042 100644 --- a/app/Module/StoriesModule.php +++ b/app/Module/StoriesModule.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; @@ -29,7 +30,6 @@ use Fisharebest\Webtrees\Services\HtmlService; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Module/SubmitterListModule.php b/app/Module/SubmitterListModule.php index 66045def8a..8d04eb0986 100644 --- a/app/Module/SubmitterListModule.php +++ b/app/Module/SubmitterListModule.php @@ -20,13 +20,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; diff --git a/app/Module/TopPageViewsModule.php b/app/Module/TopPageViewsModule.php index 7161eb18f4..f22564c627 100644 --- a/app/Module/TopPageViewsModule.php +++ b/app/Module/TopPageViewsModule.php @@ -19,12 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Str; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php index e25d861364..acfdf6a7c6 100644 --- a/app/Module/TopSurnamesModule.php +++ b/app/Module/TopSurnamesModule.php @@ -20,12 +20,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Support\Str; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Module/UserFavoritesModule.php b/app/Module/UserFavoritesModule.php index a40b56dc20..a8e334817b 100644 --- a/app/Module/UserFavoritesModule.php +++ b/app/Module/UserFavoritesModule.php @@ -21,13 +21,13 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Http\RequestHandlers\UserPage; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Str; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Module/UserJournalModule.php b/app/Module/UserJournalModule.php index 386feb3f95..f469e769b5 100644 --- a/app/Module/UserJournalModule.php +++ b/app/Module/UserJournalModule.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\Exceptions\HttpAccessDeniedException; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; use Fisharebest\Webtrees\Http\RequestHandlers\UserPage; @@ -28,7 +29,6 @@ use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\HtmlService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Support\Str; use Psr\Http\Message\ResponseInterface; diff --git a/app/Module/UserMessagesModule.php b/app/Module/UserMessagesModule.php index 18c1e316f1..0c93d821ae 100644 --- a/app/Module/UserMessagesModule.php +++ b/app/Module/UserMessagesModule.php @@ -21,6 +21,7 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\RequestHandlers\TreePage; use Fisharebest\Webtrees\Http\RequestHandlers\UserPage; use Fisharebest\Webtrees\I18N; @@ -29,7 +30,6 @@ use Fisharebest\Webtrees\Services\MessageService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Str; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Note.php b/app/Note.php index c4c2fe3299..e103d30172 100644 --- a/app/Note.php +++ b/app/Note.php @@ -21,7 +21,6 @@ namespace Fisharebest\Webtrees; use Fisharebest\Webtrees\Factories\MarkdownFactory; use Fisharebest\Webtrees\Http\RequestHandlers\NotePage; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Str; use function explode; diff --git a/app/Place.php b/app/Place.php index f501f435fd..65fd798965 100644 --- a/app/Place.php +++ b/app/Place.php @@ -23,7 +23,6 @@ use Fisharebest\Webtrees\Module\ModuleInterface; use Fisharebest\Webtrees\Module\ModuleListInterface; use Fisharebest\Webtrees\Module\PlaceHierarchyListModule; use Fisharebest\Webtrees\Services\ModuleService; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use function e; diff --git a/app/PlaceLocation.php b/app/PlaceLocation.php index 3aa167cf53..20db978a63 100644 --- a/app/PlaceLocation.php +++ b/app/PlaceLocation.php @@ -19,7 +19,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Support\Collection; diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php index 94713ccdaf..80d8f0e835 100644 --- a/app/Report/ReportParserGenerate.php +++ b/app/Report/ReportParserGenerate.php @@ -22,6 +22,7 @@ namespace Fisharebest\Webtrees\Report; use DomainException; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Date; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Elements\UnknownElement; use Fisharebest\Webtrees\Factories\MarkdownFactory; use Fisharebest\Webtrees\Family; @@ -35,12 +36,10 @@ use Fisharebest\Webtrees\Note; use Fisharebest\Webtrees\Place; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Str; -use League\Flysystem\FilesystemOperator; use LogicException; use Symfony\Component\Cache\Adapter\NullAdapter; use Symfony\Component\ExpressionLanguage\ExpressionLanguage; diff --git a/app/Schema/Migration0.php b/app/Schema/Migration0.php index 96bf7cfb81..4bd2cb6e0f 100644 --- a/app/Schema/Migration0.php +++ b/app/Schema/Migration0.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; use Illuminate\Database\Schema\Blueprint; /** diff --git a/app/Schema/Migration37.php b/app/Schema/Migration37.php index 604b17dbbf..6474ebc97f 100644 --- a/app/Schema/Migration37.php +++ b/app/Schema/Migration37.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Schema\Blueprint; diff --git a/app/Schema/Migration38.php b/app/Schema/Migration38.php index 5383027e6f..3d2d1dd09f 100644 --- a/app/Schema/Migration38.php +++ b/app/Schema/Migration38.php @@ -19,9 +19,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; -use Illuminate\Database\Schema\Blueprint; - /** * Upgrade the database schema from version 38 to version 39. */ diff --git a/app/Schema/Migration39.php b/app/Schema/Migration39.php index 10c73a942f..b5f90c29a4 100644 --- a/app/Schema/Migration39.php +++ b/app/Schema/Migration39.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; use Illuminate\Database\Schema\Blueprint; /** diff --git a/app/Schema/Migration40.php b/app/Schema/Migration40.php index a0bccea5da..fc50710702 100644 --- a/app/Schema/Migration40.php +++ b/app/Schema/Migration40.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; use Illuminate\Database\Schema\Blueprint; /** diff --git a/app/Schema/Migration41.php b/app/Schema/Migration41.php index 945b32720e..78c05326bb 100644 --- a/app/Schema/Migration41.php +++ b/app/Schema/Migration41.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; use Illuminate\Database\Schema\Blueprint; /** diff --git a/app/Schema/Migration42.php b/app/Schema/Migration42.php index b51f8df7ac..3def4d95e7 100644 --- a/app/Schema/Migration42.php +++ b/app/Schema/Migration42.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Module\ModuleBlockInterface; use Fisharebest\Webtrees\Module\ModuleChartInterface; use Fisharebest\Webtrees\Module\ModuleListInterface; @@ -27,7 +28,6 @@ use Fisharebest\Webtrees\Module\ModuleReportInterface; use Fisharebest\Webtrees\Module\ModuleSidebarInterface; use Fisharebest\Webtrees\Module\ModuleTabInterface; use Fisharebest\Webtrees\Module\ModuleThemeInterface; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Schema\Blueprint; /** diff --git a/app/Schema/Migration43.php b/app/Schema/Migration43.php index 8c1cac1e5b..53258bd225 100644 --- a/app/Schema/Migration43.php +++ b/app/Schema/Migration43.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; /** * Upgrade the database schema from version 43 to version 44. diff --git a/app/Schema/Migration44.php b/app/Schema/Migration44.php index f8921dab61..1b1d4cb423 100644 --- a/app/Schema/Migration44.php +++ b/app/Schema/Migration44.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Schema\Blueprint; use PDOException; diff --git a/app/Schema/SeedDefaultResnTable.php b/app/Schema/SeedDefaultResnTable.php index e7c075b53f..ca614be676 100644 --- a/app/Schema/SeedDefaultResnTable.php +++ b/app/Schema/SeedDefaultResnTable.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; /** * Populate the default_resn table diff --git a/app/Schema/SeedGedcomTable.php b/app/Schema/SeedGedcomTable.php index de6f04577c..29c1a6f670 100644 --- a/app/Schema/SeedGedcomTable.php +++ b/app/Schema/SeedGedcomTable.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; /** * Populate the gedcom table diff --git a/app/Schema/SeedUserTable.php b/app/Schema/SeedUserTable.php index 19e55b0158..063c8bed58 100644 --- a/app/Schema/SeedUserTable.php +++ b/app/Schema/SeedUserTable.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Schema; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; /** * Populate the user table diff --git a/app/Services/AdminService.php b/app/Services/AdminService.php index 9d15920a87..7da328812c 100644 --- a/app/Services/AdminService.php +++ b/app/Services/AdminService.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Encodings\UTF8; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomRecord; @@ -30,7 +31,6 @@ use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Site; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/app/Services/CalendarService.php b/app/Services/CalendarService.php index 42724da048..a20e25e6df 100644 --- a/app/Services/CalendarService.php +++ b/app/Services/CalendarService.php @@ -28,13 +28,13 @@ use Fisharebest\Webtrees\Date\HijriDate; use Fisharebest\Webtrees\Date\JalaliDate; use Fisharebest\Webtrees\Date\JewishDate; use Fisharebest\Webtrees\Date\JulianDate; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/app/Services/GedcomExportService.php b/app/Services/GedcomExportService.php index d31743615b..9d4c342d54 100644 --- a/app/Services/GedcomExportService.php +++ b/app/Services/GedcomExportService.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Encodings\UTF16BE; use Fisharebest\Webtrees\Encodings\UTF16LE; use Fisharebest\Webtrees\Encodings\UTF8; @@ -32,7 +33,6 @@ use Fisharebest\Webtrees\Header; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Support\Collection; diff --git a/app/Services/GedcomImportService.php b/app/Services/GedcomImportService.php index d5fbce05aa..9dd432d2c9 100644 --- a/app/Services/GedcomImportService.php +++ b/app/Services/GedcomImportService.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; use Fisharebest\Webtrees\Date; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Elements\UnknownElement; use Fisharebest\Webtrees\Exceptions\GedcomErrorException; use Fisharebest\Webtrees\Family; @@ -38,7 +39,6 @@ use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Submission; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\JoinClause; use function array_chunk; diff --git a/app/Services/HomePageService.php b/app/Services/HomePageService.php index d47421988b..96e536e092 100644 --- a/app/Services/HomePageService.php +++ b/app/Services/HomePageService.php @@ -21,12 +21,12 @@ namespace Fisharebest\Webtrees\Services; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; use Fisharebest\Webtrees\Module\ModuleBlockInterface; use Fisharebest\Webtrees\Module\ModuleInterface; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Services/HousekeepingService.php b/app/Services/HousekeepingService.php index 599b870002..0c86e5c6e0 100644 --- a/app/Services/HousekeepingService.php +++ b/app/Services/HousekeepingService.php @@ -19,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; -use Illuminate\Database\Capsule\Manager as DB; +use Fisharebest\Webtrees\DB; use League\Flysystem\FilesystemException; use League\Flysystem\FilesystemOperator; use League\Flysystem\FilesystemReader; diff --git a/app/Services/LinkedRecordService.php b/app/Services/LinkedRecordService.php index 41f3be1467..9368240c43 100644 --- a/app/Services/LinkedRecordService.php +++ b/app/Services/LinkedRecordService.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Individual; @@ -29,7 +30,6 @@ use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Submitter; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; diff --git a/app/Services/MapDataService.php b/app/Services/MapDataService.php index 3b84537025..8747e75a43 100644 --- a/app/Services/MapDataService.php +++ b/app/Services/MapDataService.php @@ -19,11 +19,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\PlaceLocation; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Support\Collection; diff --git a/app/Services/MediaFileService.php b/app/Services/MediaFileService.php index fbb7a36731..b7a0981b6d 100644 --- a/app/Services/MediaFileService.php +++ b/app/Services/MediaFileService.php @@ -19,13 +19,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Exceptions\FileUploadException; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; @@ -50,7 +50,6 @@ use function pathinfo; use function sha1; use function sort; use function str_contains; -use function strlen; use function strtoupper; use function strtr; use function substr; diff --git a/app/Services/MessageService.php b/app/Services/MessageService.php index 26caf49137..9ee60a474e 100644 --- a/app/Services/MessageService.php +++ b/app/Services/MessageService.php @@ -21,12 +21,12 @@ namespace Fisharebest\Webtrees\Services; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\SiteUser; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use function array_filter; diff --git a/app/Services/MigrationService.php b/app/Services/MigrationService.php index 8e12dacbdf..c2cc8b4ab7 100644 --- a/app/Services/MigrationService.php +++ b/app/Services/MigrationService.php @@ -19,12 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Schema\MigrationInterface; use Fisharebest\Webtrees\Schema\SeedDefaultResnTable; use Fisharebest\Webtrees\Schema\SeedGedcomTable; use Fisharebest\Webtrees\Schema\SeedUserTable; use Fisharebest\Webtrees\Site; -use Illuminate\Database\Capsule\Manager as DB; use PDOException; /** diff --git a/app/Services/ModuleService.php b/app/Services/ModuleService.php index da59ac65a5..da7a31f5c5 100644 --- a/app/Services/ModuleService.php +++ b/app/Services/ModuleService.php @@ -22,6 +22,7 @@ namespace Fisharebest\Webtrees\Services; use Closure; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Module\AhnentafelReportModule; @@ -257,7 +258,6 @@ use Fisharebest\Webtrees\Module\YahrzeitModule; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use Psr\Http\Server\MiddlewareInterface; use Throwable; diff --git a/app/Services/PendingChangesService.php b/app/Services/PendingChangesService.php index cf409cb81c..86c1067c8d 100644 --- a/app/Services/PendingChangesService.php +++ b/app/Services/PendingChangesService.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Exceptions\GedcomErrorException; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Gedcom; @@ -34,7 +35,6 @@ use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Submission; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Support\Collection; diff --git a/app/Services/SearchService.php b/app/Services/SearchService.php index 32725c87c4..a560b9b2a9 100644 --- a/app/Services/SearchService.php +++ b/app/Services/SearchService.php @@ -21,6 +21,7 @@ namespace Fisharebest\Webtrees\Services; use Closure; use Fisharebest\Webtrees\Date; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\GedcomRecord; @@ -39,7 +40,6 @@ use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Submission; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; @@ -51,7 +51,6 @@ use function array_map; use function array_unique; use function explode; use function implode; -use function is_string; use function mb_stripos; use function preg_match; use function preg_quote; diff --git a/app/Services/SiteLogsService.php b/app/Services/SiteLogsService.php index 7656c34468..e51c0149ee 100644 --- a/app/Services/SiteLogsService.php +++ b/app/Services/SiteLogsService.php @@ -19,9 +19,9 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Psr\Http\Message\ServerRequestInterface; diff --git a/app/Services/TreeService.php b/app/Services/TreeService.php index 9685fc85c3..e18c1cf97b 100644 --- a/app/Services/TreeService.php +++ b/app/Services/TreeService.php @@ -22,12 +22,12 @@ namespace Fisharebest\Webtrees\Services; use DomainException; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\GedcomFilters\GedcomEncodingFilter; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Site; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; diff --git a/app/Services/UpgradeService.php b/app/Services/UpgradeService.php index 7f4843d09b..3dda7c2769 100644 --- a/app/Services/UpgradeService.php +++ b/app/Services/UpgradeService.php @@ -21,6 +21,7 @@ namespace Fisharebest\Webtrees\Services; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Contracts\TimestampInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\Exceptions\HttpServerErrorException; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; @@ -28,7 +29,6 @@ use Fisharebest\Webtrees\Site; use Fisharebest\Webtrees\Webtrees; use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use League\Flysystem\Filesystem; use League\Flysystem\FilesystemException; diff --git a/app/Services/UserService.php b/app/Services/UserService.php index b949f998f1..723e58c92f 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -22,13 +22,13 @@ namespace Fisharebest\Webtrees\Services; use Closure; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\RequestHandlers\ContactPage; use Fisharebest\Webtrees\Http\RequestHandlers\MessagePage; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\User; use Fisharebest\Webtrees\Validator; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/app/SessionDatabaseHandler.php b/app/SessionDatabaseHandler.php index 9370699280..cbdb22f8e9 100644 --- a/app/SessionDatabaseHandler.php +++ b/app/SessionDatabaseHandler.php @@ -19,7 +19,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ServerRequestInterface; use SessionHandlerInterface; diff --git a/app/Site.php b/app/Site.php index c8b0b6bd06..6b57892a96 100644 --- a/app/Site.php +++ b/app/Site.php @@ -19,8 +19,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees; -use Illuminate\Database\Capsule\Manager as DB; - use function in_array; use function mb_substr; diff --git a/app/Source.php b/app/Source.php index 66131308ff..0550c6348b 100644 --- a/app/Source.php +++ b/app/Source.php @@ -20,7 +20,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees; use Fisharebest\Webtrees\Http\RequestHandlers\SourcePage; -use Illuminate\Database\Capsule\Manager as DB; /** * A GEDCOM source (SOUR) object. diff --git a/app/Statistics/Google/ChartAge.php b/app/Statistics/Google/ChartAge.php index 4fc54dd462..c6eb4d86a6 100644 --- a/app/Statistics/Google/ChartAge.php +++ b/app/Statistics/Google/ChartAge.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Service\CenturyService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/app/Statistics/Google/ChartBirth.php b/app/Statistics/Google/ChartBirth.php index 6471fce551..7549d09b67 100644 --- a/app/Statistics/Google/ChartBirth.php +++ b/app/Statistics/Google/ChartBirth.php @@ -19,11 +19,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Service\CenturyService; use Fisharebest\Webtrees\Statistics\Service\ColorService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use stdClass; diff --git a/app/Statistics/Google/ChartChildren.php b/app/Statistics/Google/ChartChildren.php index 8fb4dfb256..8a821edc7d 100644 --- a/app/Statistics/Google/ChartChildren.php +++ b/app/Statistics/Google/ChartChildren.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Service\CenturyService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; use stdClass; diff --git a/app/Statistics/Google/ChartDeath.php b/app/Statistics/Google/ChartDeath.php index c258a46078..739beb2702 100644 --- a/app/Statistics/Google/ChartDeath.php +++ b/app/Statistics/Google/ChartDeath.php @@ -19,11 +19,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Service\CenturyService; use Fisharebest\Webtrees\Statistics\Service\ColorService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use stdClass; diff --git a/app/Statistics/Google/ChartDistribution.php b/app/Statistics/Google/ChartDistribution.php index 523f6d8a84..da2cadd499 100644 --- a/app/Statistics/Google/ChartDistribution.php +++ b/app/Statistics/Google/ChartDistribution.php @@ -19,11 +19,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Repository\Interfaces\IndividualRepositoryInterface; use Fisharebest\Webtrees\Statistics\Service\CountryService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; diff --git a/app/Statistics/Google/ChartDivorce.php b/app/Statistics/Google/ChartDivorce.php index 2ebac8f2bc..6aa83e6db4 100644 --- a/app/Statistics/Google/ChartDivorce.php +++ b/app/Statistics/Google/ChartDivorce.php @@ -19,11 +19,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Service\CenturyService; use Fisharebest\Webtrees\Statistics\Service\ColorService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use stdClass; diff --git a/app/Statistics/Google/ChartFamilyLargest.php b/app/Statistics/Google/ChartFamilyLargest.php index f6cb7688c8..40a7423e32 100644 --- a/app/Statistics/Google/ChartFamilyLargest.php +++ b/app/Statistics/Google/ChartFamilyLargest.php @@ -19,12 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Statistics\Service\ColorService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function count; use function htmlspecialchars_decode; diff --git a/app/Statistics/Google/ChartMarriage.php b/app/Statistics/Google/ChartMarriage.php index 323cf78c68..a811191e3b 100644 --- a/app/Statistics/Google/ChartMarriage.php +++ b/app/Statistics/Google/ChartMarriage.php @@ -19,11 +19,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Service\CenturyService; use Fisharebest\Webtrees\Statistics\Service\ColorService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; use stdClass; diff --git a/app/Statistics/Google/ChartMarriageAge.php b/app/Statistics/Google/ChartMarriageAge.php index 166c42a594..78113b7e92 100644 --- a/app/Statistics/Google/ChartMarriageAge.php +++ b/app/Statistics/Google/ChartMarriageAge.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Service\CenturyService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/app/Statistics/Google/ChartNoChildrenFamilies.php b/app/Statistics/Google/ChartNoChildrenFamilies.php index 327dd0c684..082aff3be7 100644 --- a/app/Statistics/Google/ChartNoChildrenFamilies.php +++ b/app/Statistics/Google/ChartNoChildrenFamilies.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Service\CenturyService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\JoinClause; use function view; diff --git a/app/Statistics/Repository/EventRepository.php b/app/Statistics/Repository/EventRepository.php index 77af51d081..1fac0a4456 100644 --- a/app/Statistics/Repository/EventRepository.php +++ b/app/Statistics/Repository/EventRepository.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Repository; use Fisharebest\Webtrees\Date; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Elements\UnknownElement; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; @@ -31,7 +32,6 @@ use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Statistics\Repository\Interfaces\EventRepositoryInterface; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function abs; use function array_map; diff --git a/app/Statistics/Repository/FamilyDatesRepository.php b/app/Statistics/Repository/FamilyDatesRepository.php index 7ed489f2bc..7fdfc4e954 100644 --- a/app/Statistics/Repository/FamilyDatesRepository.php +++ b/app/Statistics/Repository/FamilyDatesRepository.php @@ -20,13 +20,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Repository; use Fisharebest\Webtrees\Date; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Statistics\Repository\Interfaces\FamilyDatesRepositoryInterface; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use function abs; diff --git a/app/Statistics/Repository/FamilyRepository.php b/app/Statistics/Repository/FamilyRepository.php index 51d3a3a9ae..1f88fca4cc 100644 --- a/app/Statistics/Repository/FamilyRepository.php +++ b/app/Statistics/Repository/FamilyRepository.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Repository; use Exception; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; @@ -34,7 +35,6 @@ use Fisharebest\Webtrees\Statistics\Google\ChartNoChildrenFamilies; use Fisharebest\Webtrees\Statistics\Service\CenturyService; use Fisharebest\Webtrees\Statistics\Service\ColorService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; diff --git a/app/Statistics/Repository/GedcomRepository.php b/app/Statistics/Repository/GedcomRepository.php index 72965b7f26..199cb0f520 100644 --- a/app/Statistics/Repository/GedcomRepository.php +++ b/app/Statistics/Repository/GedcomRepository.php @@ -20,12 +20,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Repository; use Exception; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Header; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Statistics\Repository\Interfaces\GedcomRepositoryInterface; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function e; use function str_contains; diff --git a/app/Statistics/Repository/HitCountRepository.php b/app/Statistics/Repository/HitCountRepository.php index aece029bfb..51c183b254 100644 --- a/app/Statistics/Repository/HitCountRepository.php +++ b/app/Statistics/Repository/HitCountRepository.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Statistics\Repository; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Statistics\Repository\Interfaces\HitCountRepositoryInterface; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use function view; diff --git a/app/Statistics/Repository/IndividualRepository.php b/app/Statistics/Repository/IndividualRepository.php index 710a8f956a..abb4a789e2 100644 --- a/app/Statistics/Repository/IndividualRepository.php +++ b/app/Statistics/Repository/IndividualRepository.php @@ -20,6 +20,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Repository; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; @@ -42,7 +43,6 @@ use Fisharebest\Webtrees\Statistics\Repository\Interfaces\IndividualRepositoryIn use Fisharebest\Webtrees\Statistics\Service\CenturyService; use Fisharebest\Webtrees\Statistics\Service\ColorService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; diff --git a/app/Statistics/Repository/LatestUserRepository.php b/app/Statistics/Repository/LatestUserRepository.php index 872fc192fa..f7fc037e2c 100644 --- a/app/Statistics/Repository/LatestUserRepository.php +++ b/app/Statistics/Repository/LatestUserRepository.php @@ -21,11 +21,11 @@ namespace Fisharebest\Webtrees\Statistics\Repository; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Statistics\Repository\Interfaces\LatestUserRepositoryInterface; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\JoinClause; diff --git a/app/Statistics/Repository/MediaRepository.php b/app/Statistics/Repository/MediaRepository.php index 10d7f18f2c..54c5569674 100644 --- a/app/Statistics/Repository/MediaRepository.php +++ b/app/Statistics/Repository/MediaRepository.php @@ -19,12 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Repository; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Google\ChartMedia; use Fisharebest\Webtrees\Statistics\Repository\Interfaces\MediaRepositoryInterface; use Fisharebest\Webtrees\Statistics\Service\ColorService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; /** diff --git a/app/Statistics/Repository/MessageRepository.php b/app/Statistics/Repository/MessageRepository.php index d89ebebf98..80927bfd84 100644 --- a/app/Statistics/Repository/MessageRepository.php +++ b/app/Statistics/Repository/MessageRepository.php @@ -20,9 +20,9 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Repository; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Repository\Interfaces\MessageRepositoryInterface; -use Illuminate\Database\Capsule\Manager as DB; /** * A repository providing methods for user message related statistics. diff --git a/app/Statistics/Repository/NewsRepository.php b/app/Statistics/Repository/NewsRepository.php index ce4e641fc1..6fa1449a36 100644 --- a/app/Statistics/Repository/NewsRepository.php +++ b/app/Statistics/Repository/NewsRepository.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Repository; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Statistics\Repository\Interfaces\NewsRepositoryInterface; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; /** * A repository providing methods for news related statistics. diff --git a/app/Statistics/Repository/PlaceRepository.php b/app/Statistics/Repository/PlaceRepository.php index 66de8a00e5..6e8fd7c906 100644 --- a/app/Statistics/Repository/PlaceRepository.php +++ b/app/Statistics/Repository/PlaceRepository.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Repository; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Place; use Fisharebest\Webtrees\Statistics\Google\ChartDistribution; @@ -26,7 +27,6 @@ use Fisharebest\Webtrees\Statistics\Repository\Interfaces\IndividualRepositoryIn use Fisharebest\Webtrees\Statistics\Repository\Interfaces\PlaceRepositoryInterface; use Fisharebest\Webtrees\Statistics\Service\CountryService; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; diff --git a/app/Tree.php b/app/Tree.php index 15dabc2eb3..30eeaf3dce 100644 --- a/app/Tree.php +++ b/app/Tree.php @@ -22,7 +22,6 @@ namespace Fisharebest\Webtrees; use Closure; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Services\PendingChangesService; -use Illuminate\Database\Capsule\Manager as DB; use InvalidArgumentException; use League\Flysystem\FilesystemOperator; diff --git a/app/User.php b/app/User.php index a4276a7d67..e2e5a3d0db 100644 --- a/app/User.php +++ b/app/User.php @@ -21,7 +21,6 @@ namespace Fisharebest\Webtrees; use Closure; use Fisharebest\Webtrees\Contracts\UserInterface; -use Illuminate\Database\Capsule\Manager as DB; use function is_string; diff --git a/resources/views/admin/trees.phtml b/resources/views/admin/trees.phtml index d8c37edf71..9ccdf920f8 100644 --- a/resources/views/admin/trees.phtml +++ b/resources/views/admin/trees.phtml @@ -3,6 +3,7 @@ declare(strict_types=1); use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Http\RequestHandlers\AddUnlinkedPage; use Fisharebest\Webtrees\Http\RequestHandlers\CheckTree; use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; @@ -13,8 +14,8 @@ use Fisharebest\Webtrees\Http\RequestHandlers\CreateSourceModal; use Fisharebest\Webtrees\Http\RequestHandlers\CreateSubmitterModal; use Fisharebest\Webtrees\Http\RequestHandlers\DataFixChoose; use Fisharebest\Webtrees\Http\RequestHandlers\DeleteTreeAction; -use Fisharebest\Webtrees\Http\RequestHandlers\FindDuplicateRecords; use Fisharebest\Webtrees\Http\RequestHandlers\ExportGedcomPage; +use Fisharebest\Webtrees\Http\RequestHandlers\FindDuplicateRecords; use Fisharebest\Webtrees\Http\RequestHandlers\GedcomLoad; use Fisharebest\Webtrees\Http\RequestHandlers\ImportGedcomPage; use Fisharebest\Webtrees\Http\RequestHandlers\MergeRecordsPage; @@ -29,7 +30,6 @@ use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Site; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; -use Illuminate\Database\Capsule\Manager as DB; /** * @var array<Tree> $all_trees diff --git a/resources/views/lists/locations-table.phtml b/resources/views/lists/locations-table.phtml index 1ef3976c06..f11dde6fb0 100644 --- a/resources/views/lists/locations-table.phtml +++ b/resources/views/lists/locations-table.phtml @@ -2,10 +2,10 @@ declare(strict_types=1); +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Location; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/resources/views/lists/media-table.phtml b/resources/views/lists/media-table.phtml index b1eebfebe6..d6cd20d8cc 100644 --- a/resources/views/lists/media-table.phtml +++ b/resources/views/lists/media-table.phtml @@ -2,10 +2,10 @@ declare(strict_types=1); +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Media; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/resources/views/lists/notes-table.phtml b/resources/views/lists/notes-table.phtml index 8f59ae43b0..00c2d1f26a 100644 --- a/resources/views/lists/notes-table.phtml +++ b/resources/views/lists/notes-table.phtml @@ -2,10 +2,10 @@ declare(strict_types=1); +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Note; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/resources/views/lists/repositories-table.phtml b/resources/views/lists/repositories-table.phtml index 76d754238f..4283c5f281 100644 --- a/resources/views/lists/repositories-table.phtml +++ b/resources/views/lists/repositories-table.phtml @@ -2,10 +2,10 @@ declare(strict_types=1); +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/resources/views/lists/sources-table.phtml b/resources/views/lists/sources-table.phtml index 41a9657888..22cc809866 100644 --- a/resources/views/lists/sources-table.phtml +++ b/resources/views/lists/sources-table.phtml @@ -2,11 +2,11 @@ declare(strict_types=1); +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/resources/views/lists/submitters-table.phtml b/resources/views/lists/submitters-table.phtml index 01d9d1890b..83192129b5 100644 --- a/resources/views/lists/submitters-table.phtml +++ b/resources/views/lists/submitters-table.phtml @@ -2,10 +2,10 @@ declare(strict_types=1); +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; -use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; diff --git a/tests/TestCase.php b/tests/TestCase.php index bb17428bae..ab4e780192 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -32,7 +32,6 @@ use Fisharebest\Webtrees\Services\MigrationService; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\TimeoutService; use Fisharebest\Webtrees\Services\TreeService; -use Illuminate\Database\Capsule\Manager as DB; use PHPUnit\Framework\Constraint\Callback; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestFactoryInterface; diff --git a/tests/app/Services/ModuleServiceTest.php b/tests/app/Services/ModuleServiceTest.php index 39a1b5f59d..5e36c67b93 100644 --- a/tests/app/Services/ModuleServiceTest.php +++ b/tests/app/Services/ModuleServiceTest.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; +use Fisharebest\Webtrees\DB; use Fisharebest\Webtrees\Module\ModuleAnalyticsInterface; use Fisharebest\Webtrees\Module\ModuleBlockInterface; use Fisharebest\Webtrees\Module\ModuleChartInterface; @@ -32,7 +33,6 @@ use Fisharebest\Webtrees\Module\ModuleSidebarInterface; use Fisharebest\Webtrees\Module\ModuleTabInterface; use Fisharebest\Webtrees\Module\ModuleThemeInterface; use Fisharebest\Webtrees\TestCase; -use Illuminate\Database\Capsule\Manager as DB; /** * Test the modules |