diff options
59 files changed, 84 insertions, 86 deletions
diff --git a/app/Factories/SharedNoteFactory.php b/app/Factories/SharedNoteFactory.php index 5564135079..1e8f0533ee 100644 --- a/app/Factories/SharedNoteFactory.php +++ b/app/Factories/SharedNoteFactory.php @@ -21,8 +21,8 @@ namespace Fisharebest\Webtrees\Factories; use Closure; use Fisharebest\Webtrees\Contracts\SharedNoteFactoryInterface; -use Fisharebest\Webtrees\SharedNote; use Fisharebest\Webtrees\Registry; +use Fisharebest\Webtrees\SharedNote; use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; diff --git a/app/Http/RequestHandlers/TomSelectLocation.php b/app/Http/RequestHandlers/TomSelectLocation.php index 23c60b522a..8406f212d5 100644 --- a/app/Http/RequestHandlers/TomSelectLocation.php +++ b/app/Http/RequestHandlers/TomSelectLocation.php @@ -19,9 +19,9 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\Location; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\SearchService; -use Fisharebest\Webtrees\Location; use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; diff --git a/app/Http/Routes/WebRoutes.php b/app/Http/Routes/WebRoutes.php index 2c260c01db..db229588d1 100644 --- a/app/Http/Routes/WebRoutes.php +++ b/app/Http/Routes/WebRoutes.php @@ -193,12 +193,12 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ModulesListsAction; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesListsPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapAutocompleteAction; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapAutocompletePage; +use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapGeoLocationsAction; +use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapGeoLocationsPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapLinksAction; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapLinksPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapProvidersAction; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapProvidersPage; -use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapGeoLocationsAction; -use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapGeoLocationsPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMenusAction; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMenusPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesReportsAction; @@ -261,22 +261,11 @@ use Fisharebest\Webtrees\Http\RequestHandlers\SearchPhoneticPage; use Fisharebest\Webtrees\Http\RequestHandlers\SearchQuickAction; use Fisharebest\Webtrees\Http\RequestHandlers\SearchReplaceAction; use Fisharebest\Webtrees\Http\RequestHandlers\SearchReplacePage; -use Fisharebest\Webtrees\Http\RequestHandlers\SharedNotePage; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectFamily; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectIndividual; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectLocation; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectMediaObject; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectNote; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectPlace; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectRepository; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectSharedNote; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectSource; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectSubmission; -use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectSubmitter; use Fisharebest\Webtrees\Http\RequestHandlers\SelectDefaultTree; use Fisharebest\Webtrees\Http\RequestHandlers\SelectLanguage; use Fisharebest\Webtrees\Http\RequestHandlers\SelectNewFact; use Fisharebest\Webtrees\Http\RequestHandlers\SelectTheme; +use Fisharebest\Webtrees\Http\RequestHandlers\SharedNotePage; use Fisharebest\Webtrees\Http\RequestHandlers\SiteLogsAction; use Fisharebest\Webtrees\Http\RequestHandlers\SiteLogsData; use Fisharebest\Webtrees\Http\RequestHandlers\SiteLogsDelete; @@ -286,10 +275,23 @@ use Fisharebest\Webtrees\Http\RequestHandlers\SitePreferencesAction; use Fisharebest\Webtrees\Http\RequestHandlers\SitePreferencesPage; use Fisharebest\Webtrees\Http\RequestHandlers\SiteRegistrationAction; use Fisharebest\Webtrees\Http\RequestHandlers\SiteRegistrationPage; +use Fisharebest\Webtrees\Http\RequestHandlers\SiteTagsAction; +use Fisharebest\Webtrees\Http\RequestHandlers\SiteTagsPage; use Fisharebest\Webtrees\Http\RequestHandlers\SourcePage; use Fisharebest\Webtrees\Http\RequestHandlers\SubmissionPage; use Fisharebest\Webtrees\Http\RequestHandlers\SubmitterPage; use Fisharebest\Webtrees\Http\RequestHandlers\SynchronizeTrees; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectFamily; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectIndividual; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectLocation; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectMediaObject; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectNote; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectPlace; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectRepository; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectSharedNote; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectSource; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectSubmission; +use Fisharebest\Webtrees\Http\RequestHandlers\TomSelectSubmitter; use Fisharebest\Webtrees\Http\RequestHandlers\TreePage; use Fisharebest\Webtrees\Http\RequestHandlers\TreePageBlock; use Fisharebest\Webtrees\Http\RequestHandlers\TreePageBlockEdit; @@ -302,8 +304,6 @@ use Fisharebest\Webtrees\Http\RequestHandlers\TreePreferencesAction; use Fisharebest\Webtrees\Http\RequestHandlers\TreePreferencesPage; use Fisharebest\Webtrees\Http\RequestHandlers\TreePrivacyAction; use Fisharebest\Webtrees\Http\RequestHandlers\TreePrivacyPage; -use Fisharebest\Webtrees\Http\RequestHandlers\SiteTagsAction; -use Fisharebest\Webtrees\Http\RequestHandlers\SiteTagsPage; use Fisharebest\Webtrees\Http\RequestHandlers\UnconnectedAction; use Fisharebest\Webtrees\Http\RequestHandlers\UnconnectedPage; use Fisharebest\Webtrees\Http\RequestHandlers\UpgradeWizardConfirm; diff --git a/app/Module/AbstractModule.php b/app/Module/AbstractModule.php index 07b4ddafa5..5f90eac2fd 100644 --- a/app/Module/AbstractModule.php +++ b/app/Module/AbstractModule.php @@ -20,8 +20,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Http\ViewResponseTrait; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Webtrees; use Illuminate\Database\Capsule\Manager as DB; diff --git a/app/Module/AlbumModule.php b/app/Module/AlbumModule.php index 34b15eb0e7..2807530a8f 100644 --- a/app/Module/AlbumModule.php +++ b/app/Module/AlbumModule.php @@ -19,11 +19,11 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Media; +use Fisharebest\Webtrees\Registry; use Illuminate\Support\Collection; /** diff --git a/app/Module/DescendancyModule.php b/app/Module/DescendancyModule.php index 105f16f387..6b50ead8f3 100644 --- a/app/Module/DescendancyModule.php +++ b/app/Module/DescendancyModule.php @@ -19,10 +19,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\SearchService; use Fisharebest\Webtrees\Validator; use Psr\Http\Message\ResponseInterface; diff --git a/app/Module/LanguageGeorgian.php b/app/Module/LanguageGeorgian.php index 077265395d..8696b83276 100644 --- a/app/Module/LanguageGeorgian.php +++ b/app/Module/LanguageGeorgian.php @@ -19,8 +19,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\Localization\Locale\LocaleKa; use Fisharebest\Localization\Locale\LocaleInterface; +use Fisharebest\Localization\Locale\LocaleKa; /** * Class LanguageGeorgian. diff --git a/app/Module/LanguageHebrew.php b/app/Module/LanguageHebrew.php index 7ef112bc98..7a76dd7321 100644 --- a/app/Module/LanguageHebrew.php +++ b/app/Module/LanguageHebrew.php @@ -19,8 +19,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\ExtCalendar\JewishCalendar; use Fisharebest\ExtCalendar\CalendarInterface; +use Fisharebest\ExtCalendar\JewishCalendar; use Fisharebest\Localization\Locale\LocaleHe; use Fisharebest\Localization\Locale\LocaleInterface; diff --git a/app/Module/LanguageHindi.php b/app/Module/LanguageHindi.php index b60342e1d7..81589a37c9 100644 --- a/app/Module/LanguageHindi.php +++ b/app/Module/LanguageHindi.php @@ -19,8 +19,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\Localization\Locale\LocaleInterface; use Fisharebest\Localization\Locale\LocaleHi; +use Fisharebest\Localization\Locale\LocaleInterface; /** * Class LanguageHindi. diff --git a/app/Module/LanguageLingala.php b/app/Module/LanguageLingala.php index 1d9930f921..f6d12c5d6f 100644 --- a/app/Module/LanguageLingala.php +++ b/app/Module/LanguageLingala.php @@ -19,8 +19,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\Localization\Locale\LocaleLn; use Fisharebest\Localization\Locale\LocaleInterface; +use Fisharebest\Localization\Locale\LocaleLn; /** * Class LanguageLingala. diff --git a/app/Module/LanguageWelsh.php b/app/Module/LanguageWelsh.php index 8fa6ffce4b..037bb2052c 100644 --- a/app/Module/LanguageWelsh.php +++ b/app/Module/LanguageWelsh.php @@ -19,8 +19,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\Localization\Locale\LocaleInterface; use Fisharebest\Localization\Locale\LocaleCy; +use Fisharebest\Localization\Locale\LocaleInterface; /** * Class LanguageWelsh. diff --git a/app/Module/MediaTabModule.php b/app/Module/MediaTabModule.php index 30acfd2d1b..1c9b56cb50 100644 --- a/app/Module/MediaTabModule.php +++ b/app/Module/MediaTabModule.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Fact; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\ClipboardService; use Illuminate\Support\Collection; diff --git a/app/Module/NoteListModule.php b/app/Module/NoteListModule.php index 824daa060e..e3a4468111 100644 --- a/app/Module/NoteListModule.php +++ b/app/Module/NoteListModule.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Registry; 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; diff --git a/app/Module/RepositoryListModule.php b/app/Module/RepositoryListModule.php index 5db86b0526..97f0b7baf5 100644 --- a/app/Module/RepositoryListModule.php +++ b/app/Module/RepositoryListModule.php @@ -19,12 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\Webtrees\Registry; +use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Tree; -use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Validator; use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; diff --git a/app/Place.php b/app/Place.php index f166d65311..6967286bf8 100644 --- a/app/Place.php +++ b/app/Place.php @@ -24,7 +24,6 @@ use Fisharebest\Webtrees\Module\ModuleListInterface; use Fisharebest\Webtrees\Module\PlaceHierarchyListModule; use Fisharebest\Webtrees\Services\ModuleService; use Illuminate\Database\Capsule\Manager as DB; -use Illuminate\Database\Query\Expression; use Illuminate\Support\Collection; use function app; diff --git a/app/Registry.php b/app/Registry.php index 920173565f..acb3555c9d 100644 --- a/app/Registry.php +++ b/app/Registry.php @@ -21,12 +21,13 @@ namespace Fisharebest\Webtrees; use Fisharebest\Webtrees\Contracts\CacheFactoryInterface; use Fisharebest\Webtrees\Contracts\CalendarDateFactoryInterface; +use Fisharebest\Webtrees\Contracts\ElementFactoryInterface; use Fisharebest\Webtrees\Contracts\EncodingFactoryInterface; use Fisharebest\Webtrees\Contracts\FamilyFactoryInterface; use Fisharebest\Webtrees\Contracts\FilesystemFactoryInterface; -use Fisharebest\Webtrees\Contracts\ElementFactoryInterface; use Fisharebest\Webtrees\Contracts\GedcomRecordFactoryInterface; use Fisharebest\Webtrees\Contracts\HeaderFactoryInterface; +use Fisharebest\Webtrees\Contracts\IdFactoryInterface; use Fisharebest\Webtrees\Contracts\ImageFactoryInterface; use Fisharebest\Webtrees\Contracts\IndividualFactoryInterface; use Fisharebest\Webtrees\Contracts\LocationFactoryInterface; @@ -44,7 +45,6 @@ use Fisharebest\Webtrees\Contracts\SubmitterFactoryInterface; use Fisharebest\Webtrees\Contracts\SurnameTraditionFactoryInterface; use Fisharebest\Webtrees\Contracts\TimeFactoryInterface; use Fisharebest\Webtrees\Contracts\TimestampFactoryInterface; -use Fisharebest\Webtrees\Contracts\IdFactoryInterface; use Fisharebest\Webtrees\Contracts\XrefFactoryInterface; /** diff --git a/app/Services/AdminService.php b/app/Services/AdminService.php index 40f2870351..30a57beaf8 100644 --- a/app/Services/AdminService.php +++ b/app/Services/AdminService.php @@ -20,13 +20,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; use Fisharebest\Webtrees\Encodings\UTF8; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Header; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Media; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Site; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Tree; diff --git a/app/Services/CalendarService.php b/app/Services/CalendarService.php index a3e759a91c..063fb3863c 100644 --- a/app/Services/CalendarService.php +++ b/app/Services/CalendarService.php @@ -29,10 +29,10 @@ use Fisharebest\Webtrees\Date\JalaliDate; use Fisharebest\Webtrees\Date\JewishDate; use Fisharebest\Webtrees\Date\JulianDate; use Fisharebest\Webtrees\Fact; -use Fisharebest\Webtrees\Registry; 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; diff --git a/app/Services/DataFixService.php b/app/Services/DataFixService.php index 8e70cdb461..1ef87706d1 100644 --- a/app/Services/DataFixService.php +++ b/app/Services/DataFixService.php @@ -20,13 +20,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; use Fisharebest\Algorithm\MyersDiff; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Media; use Fisharebest\Webtrees\Note; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Submitter; diff --git a/app/Services/GedcomExportService.php b/app/Services/GedcomExportService.php index 696a2cbd2e..311cf5ded1 100644 --- a/app/Services/GedcomExportService.php +++ b/app/Services/GedcomExportService.php @@ -55,7 +55,6 @@ use function is_string; use function pathinfo; use function preg_match_all; use function rewind; -use function str_contains; use function stream_filter_append; use function stream_get_meta_data; use function strlen; diff --git a/app/Services/ModuleService.php b/app/Services/ModuleService.php index 04c7483916..a34ec47bf4 100644 --- a/app/Services/ModuleService.php +++ b/app/Services/ModuleService.php @@ -29,6 +29,7 @@ use Fisharebest\Webtrees\Module\AlbumModule; use Fisharebest\Webtrees\Module\AncestorsChartModule; use Fisharebest\Webtrees\Module\AustrianHistoricEvents; use Fisharebest\Webtrees\Module\AustrianPresidents; +use Fisharebest\Webtrees\Module\BingMaps; use Fisharebest\Webtrees\Module\BingWebmasterToolsModule; use Fisharebest\Webtrees\Module\BirthDeathMarriageReportModule; use Fisharebest\Webtrees\Module\BirthReportModule; @@ -81,6 +82,7 @@ use Fisharebest\Webtrees\Module\FrenchHistory; use Fisharebest\Webtrees\Module\FrequentlyAskedQuestionsModule; use Fisharebest\Webtrees\Module\GeonamesAutocomplete; use Fisharebest\Webtrees\Module\GoogleAnalyticsModule; +use Fisharebest\Webtrees\Module\GoogleMaps; use Fisharebest\Webtrees\Module\GoogleWebmasterToolsModule; use Fisharebest\Webtrees\Module\HereMaps; use Fisharebest\Webtrees\Module\HitCountFooterModule; @@ -169,17 +171,12 @@ use Fisharebest\Webtrees\Module\LoggedInUsersModule; use Fisharebest\Webtrees\Module\LoginBlockModule; use Fisharebest\Webtrees\Module\LowCountriesRulers; use Fisharebest\Webtrees\Module\MapBox; -use Fisharebest\Webtrees\Module\MapLinkBing; -use Fisharebest\Webtrees\Module\MapLinkGoogle; -use Fisharebest\Webtrees\Module\MapLinkOpenStreetMap; use Fisharebest\Webtrees\Module\MapGeoLocationGeonames; use Fisharebest\Webtrees\Module\MapGeoLocationNominatim; use Fisharebest\Webtrees\Module\MapGeoLocationOpenRouteService; -use Fisharebest\Webtrees\Module\BingMaps; -use Fisharebest\Webtrees\Module\GoogleMaps; -use Fisharebest\Webtrees\Module\ModuleMapAutocompleteInterface; -use Fisharebest\Webtrees\Module\OpenRouteServiceAutocomplete; -use Fisharebest\Webtrees\Module\OpenStreetMap; +use Fisharebest\Webtrees\Module\MapLinkBing; +use Fisharebest\Webtrees\Module\MapLinkGoogle; +use Fisharebest\Webtrees\Module\MapLinkOpenStreetMap; use Fisharebest\Webtrees\Module\MarriageReportModule; use Fisharebest\Webtrees\Module\MatomoAnalyticsModule; use Fisharebest\Webtrees\Module\MediaListModule; @@ -196,8 +193,9 @@ use Fisharebest\Webtrees\Module\ModuleHistoricEventsInterface; use Fisharebest\Webtrees\Module\ModuleInterface; use Fisharebest\Webtrees\Module\ModuleLanguageInterface; use Fisharebest\Webtrees\Module\ModuleListInterface; -use Fisharebest\Webtrees\Module\ModuleMapLinkInterface; +use Fisharebest\Webtrees\Module\ModuleMapAutocompleteInterface; use Fisharebest\Webtrees\Module\ModuleMapGeoLocationInterface; +use Fisharebest\Webtrees\Module\ModuleMapLinkInterface; use Fisharebest\Webtrees\Module\ModuleMapProviderInterface; use Fisharebest\Webtrees\Module\ModuleMenuInterface; use Fisharebest\Webtrees\Module\ModuleReportInterface; @@ -209,6 +207,8 @@ use Fisharebest\Webtrees\Module\NoteListModule; use Fisharebest\Webtrees\Module\NotesTabModule; use Fisharebest\Webtrees\Module\OccupationReportModule; use Fisharebest\Webtrees\Module\OnThisDayModule; +use Fisharebest\Webtrees\Module\OpenRouteServiceAutocomplete; +use Fisharebest\Webtrees\Module\OpenStreetMap; use Fisharebest\Webtrees\Module\OrdnanceSurveyHistoricMaps; use Fisharebest\Webtrees\Module\PedigreeChartModule; use Fisharebest\Webtrees\Module\PedigreeMapModule; diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 7709292dbf..889b179830 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -22,10 +22,10 @@ namespace Fisharebest\Webtrees\Services; use Closure; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Registry; 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; diff --git a/app/Statistics/Google/ChartFamilyLargest.php b/app/Statistics/Google/ChartFamilyLargest.php index d4b13f61b8..b8e48206fc 100644 --- a/app/Statistics/Google/ChartFamilyLargest.php +++ b/app/Statistics/Google/ChartFamilyLargest.php @@ -19,8 +19,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Statistics\Google; -use Fisharebest\Webtrees\Registry; 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; diff --git a/app/Statistics/Repository/EventRepository.php b/app/Statistics/Repository/EventRepository.php index 1b06616c75..ebbc4cac3e 100644 --- a/app/Statistics/Repository/EventRepository.php +++ b/app/Statistics/Repository/EventRepository.php @@ -23,11 +23,11 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Elements\UnknownElement; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\Header; use Fisharebest\Webtrees\I18N; +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; diff --git a/app/Statistics/Repository/FamilyDatesRepository.php b/app/Statistics/Repository/FamilyDatesRepository.php index b7b5b047d3..462a683040 100644 --- a/app/Statistics/Repository/FamilyDatesRepository.php +++ b/app/Statistics/Repository/FamilyDatesRepository.php @@ -21,8 +21,8 @@ namespace Fisharebest\Webtrees\Statistics\Repository; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; -use Fisharebest\Webtrees\Registry; 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; diff --git a/app/Statistics/Repository/GedcomRepository.php b/app/Statistics/Repository/GedcomRepository.php index ee502ee1a6..8188e842dd 100644 --- a/app/Statistics/Repository/GedcomRepository.php +++ b/app/Statistics/Repository/GedcomRepository.php @@ -21,8 +21,8 @@ namespace Fisharebest\Webtrees\Statistics\Repository; use Exception; use Fisharebest\Webtrees\Fact; -use Fisharebest\Webtrees\Registry; 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; diff --git a/app/Statistics/Repository/UserRepository.php b/app/Statistics/Repository/UserRepository.php index 95a6d0bfc6..ba41ff5688 100644 --- a/app/Statistics/Repository/UserRepository.php +++ b/app/Statistics/Repository/UserRepository.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Statistics\Repository; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Http\RequestHandlers\MessagePage; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\MessageService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Statistics\Repository\Interfaces\UserRepositoryInterface; diff --git a/app/Webtrees.php b/app/Webtrees.php index 52def334e3..5d635fce3c 100644 --- a/app/Webtrees.php +++ b/app/Webtrees.php @@ -29,6 +29,7 @@ use Fisharebest\Webtrees\Factories\FamilyFactory; use Fisharebest\Webtrees\Factories\FilesystemFactory; use Fisharebest\Webtrees\Factories\GedcomRecordFactory; use Fisharebest\Webtrees\Factories\HeaderFactory; +use Fisharebest\Webtrees\Factories\IdFactory; use Fisharebest\Webtrees\Factories\ImageFactory; use Fisharebest\Webtrees\Factories\IndividualFactory; use Fisharebest\Webtrees\Factories\LocationFactory; @@ -46,7 +47,6 @@ use Fisharebest\Webtrees\Factories\SubmitterFactory; use Fisharebest\Webtrees\Factories\SurnameTraditionFactory; use Fisharebest\Webtrees\Factories\TimeFactory; use Fisharebest\Webtrees\Factories\TimestampFactory; -use Fisharebest\Webtrees\Factories\IdFactory; use Fisharebest\Webtrees\Factories\XrefFactory; use Fisharebest\Webtrees\GedcomFilters\GedcomEncodingFilter; use Fisharebest\Webtrees\Http\Middleware\BadBotBlocker; diff --git a/tests/app/Elements/XrefRepositoryTest.php b/tests/app/Elements/XrefRepositoryTest.php index 020bb900b9..556c343b02 100644 --- a/tests/app/Elements/XrefRepositoryTest.php +++ b/tests/app/Elements/XrefRepositoryTest.php @@ -21,8 +21,8 @@ namespace Fisharebest\Webtrees\Elements; use DOMDocument; use Fisharebest\Webtrees\Factories\RepositoryFactory; -use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Registry; +use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Tree; use Psr\Http\Message\ServerRequestInterface; diff --git a/tests/app/Elements/XrefSharedNoteTest.php b/tests/app/Elements/XrefSharedNoteTest.php index fe248b5595..546bb6e88f 100644 --- a/tests/app/Elements/XrefSharedNoteTest.php +++ b/tests/app/Elements/XrefSharedNoteTest.php @@ -21,8 +21,8 @@ namespace Fisharebest\Webtrees\Elements; use DOMDocument; use Fisharebest\Webtrees\Factories\SharedNoteFactory; -use Fisharebest\Webtrees\SharedNote; use Fisharebest\Webtrees\Registry; +use Fisharebest\Webtrees\SharedNote; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Tree; diff --git a/tests/app/Elements/XrefSourceTest.php b/tests/app/Elements/XrefSourceTest.php index 9f5646172d..4ecb652907 100644 --- a/tests/app/Elements/XrefSourceTest.php +++ b/tests/app/Elements/XrefSourceTest.php @@ -21,8 +21,8 @@ namespace Fisharebest\Webtrees\Elements; use DOMDocument; use Fisharebest\Webtrees\Factories\SourceFactory; -use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Registry; +use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Tree; use Psr\Http\Message\ServerRequestInterface; diff --git a/tests/app/Elements/XrefSubmissionTest.php b/tests/app/Elements/XrefSubmissionTest.php index 9ab508df19..dfaa5ca6da 100644 --- a/tests/app/Elements/XrefSubmissionTest.php +++ b/tests/app/Elements/XrefSubmissionTest.php @@ -21,8 +21,8 @@ namespace Fisharebest\Webtrees\Elements; use DOMDocument; use Fisharebest\Webtrees\Factories\SubmissionFactory; -use Fisharebest\Webtrees\Submission; use Fisharebest\Webtrees\Registry; +use Fisharebest\Webtrees\Submission; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Tree; use Psr\Http\Message\ServerRequestInterface; diff --git a/tests/app/Elements/XrefSubmitterTest.php b/tests/app/Elements/XrefSubmitterTest.php index 9c650ae384..09d3199390 100644 --- a/tests/app/Elements/XrefSubmitterTest.php +++ b/tests/app/Elements/XrefSubmitterTest.php @@ -21,8 +21,8 @@ namespace Fisharebest\Webtrees\Elements; use DOMDocument; use Fisharebest\Webtrees\Factories\SubmitterFactory; -use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Registry; +use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Tree; use Psr\Http\Message\ServerRequestInterface; diff --git a/tests/app/Encodings/Windows1250Test.php b/tests/app/Encodings/Windows1250Test.php index be7ff91ac2..b70e4f1419 100644 --- a/tests/app/Encodings/Windows1250Test.php +++ b/tests/app/Encodings/Windows1250Test.php @@ -19,8 +19,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Tests\Encodings; -use Fisharebest\Webtrees\Encodings\Windows1250; use Fisharebest\Webtrees\Encodings\UTF8; +use Fisharebest\Webtrees\Encodings\Windows1250; use PHPUnit\Framework\TestCase; use function chr; diff --git a/tests/app/Encodings/Windows1251Test.php b/tests/app/Encodings/Windows1251Test.php index 9a92db6c4a..21c9d7a06e 100644 --- a/tests/app/Encodings/Windows1251Test.php +++ b/tests/app/Encodings/Windows1251Test.php @@ -19,8 +19,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Tests\Encodings; -use Fisharebest\Webtrees\Encodings\Windows1251; use Fisharebest\Webtrees\Encodings\UTF8; +use Fisharebest\Webtrees\Encodings\Windows1251; use PHPUnit\Framework\TestCase; use function chr; diff --git a/tests/app/Encodings/Windows1252Test.php b/tests/app/Encodings/Windows1252Test.php index cea18ef713..a3baeabb68 100644 --- a/tests/app/Encodings/Windows1252Test.php +++ b/tests/app/Encodings/Windows1252Test.php @@ -19,8 +19,8 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Tests\Encodings; -use Fisharebest\Webtrees\Encodings\Windows1252; use Fisharebest\Webtrees\Encodings\UTF8; +use Fisharebest\Webtrees\Encodings\Windows1252; use PHPUnit\Framework\TestCase; use function chr; diff --git a/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php b/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php index e1d50c3074..07e93fe56f 100644 --- a/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php +++ b/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\RequestMethodInterface; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Factories\IndividualFactory; -use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; +use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php b/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php index 9d9049115b..2fc9fdcc33 100644 --- a/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php +++ b/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\RequestMethodInterface; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Factories\MediaFactory; -use Fisharebest\Webtrees\Media; use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; +use Fisharebest\Webtrees\Media; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php b/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php index 0f1c95d1d0..16d0ed1442 100644 --- a/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php +++ b/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\RequestMethodInterface; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Factories\NoteFactory; -use Fisharebest\Webtrees\Note; use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; +use Fisharebest\Webtrees\Note; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php b/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php index e8443062b6..10f0192884 100644 --- a/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php +++ b/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php @@ -22,10 +22,10 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\RequestMethodInterface; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Factories\RepositoryFactory; -use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; use Fisharebest\Webtrees\Registry; +use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Tree; diff --git a/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php b/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php index 03121f0ece..e5392e2337 100644 --- a/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php +++ b/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php @@ -22,11 +22,11 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\RequestMethodInterface; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Factories\SourceFactory; -use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Http\Exceptions\HttpBadRequestException; use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\TreeService; +use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; diff --git a/tests/app/Module/AhnentafelReportModuleTest.php b/tests/app/Module/AhnentafelReportModuleTest.php index a9b3a48cf6..4ce6529656 100644 --- a/tests/app/Module/AhnentafelReportModuleTest.php +++ b/tests/app/Module/AhnentafelReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/BirthDeathMarriageReportModuleTest.php b/tests/app/Module/BirthDeathMarriageReportModuleTest.php index fea4e73b1e..6849f23c20 100644 --- a/tests/app/Module/BirthDeathMarriageReportModuleTest.php +++ b/tests/app/Module/BirthDeathMarriageReportModuleTest.php @@ -20,9 +20,9 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\TestCase; use League\Flysystem\Filesystem; diff --git a/tests/app/Module/BirthReportModuleTest.php b/tests/app/Module/BirthReportModuleTest.php index d66772ad21..a1f9880de7 100644 --- a/tests/app/Module/BirthReportModuleTest.php +++ b/tests/app/Module/BirthReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/CemeteryReportModuleTest.php b/tests/app/Module/CemeteryReportModuleTest.php index d4b6346318..b4b54e592a 100644 --- a/tests/app/Module/CemeteryReportModuleTest.php +++ b/tests/app/Module/CemeteryReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/ChangeReportModuleTest.php b/tests/app/Module/ChangeReportModuleTest.php index 5a47191aff..5ad30a1343 100644 --- a/tests/app/Module/ChangeReportModuleTest.php +++ b/tests/app/Module/ChangeReportModuleTest.php @@ -23,9 +23,9 @@ use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/DeathReportModuleTest.php b/tests/app/Module/DeathReportModuleTest.php index 4e249d5ef8..b74e9acdef 100644 --- a/tests/app/Module/DeathReportModuleTest.php +++ b/tests/app/Module/DeathReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/DescendancyReportModuleTest.php b/tests/app/Module/DescendancyReportModuleTest.php index 6c9c1749d5..99edaa69b9 100644 --- a/tests/app/Module/DescendancyReportModuleTest.php +++ b/tests/app/Module/DescendancyReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/FactSourcesReportModuleTest.php b/tests/app/Module/FactSourcesReportModuleTest.php index 786b21ef60..2de2c73fef 100644 --- a/tests/app/Module/FactSourcesReportModuleTest.php +++ b/tests/app/Module/FactSourcesReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/FamilyGroupReportModuleTest.php b/tests/app/Module/FamilyGroupReportModuleTest.php index c679217806..626e5e3cf2 100644 --- a/tests/app/Module/FamilyGroupReportModuleTest.php +++ b/tests/app/Module/FamilyGroupReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/FixDuplicateLinksTest.php b/tests/app/Module/FixDuplicateLinksTest.php index b70b85eb01..9af8520d65 100644 --- a/tests/app/Module/FixDuplicateLinksTest.php +++ b/tests/app/Module/FixDuplicateLinksTest.php @@ -20,12 +20,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Services\DataFixService; use Fisharebest\Webtrees\Services\GedcomImportService; +use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Session; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Tree; -use Fisharebest\Webtrees\Services\DataFixService; -use Fisharebest\Webtrees\Services\TreeService; use Illuminate\Support\Collection; /** diff --git a/tests/app/Module/IndividualFamiliesReportModuleTest.php b/tests/app/Module/IndividualFamiliesReportModuleTest.php index af5ea8522d..764dfb685d 100644 --- a/tests/app/Module/IndividualFamiliesReportModuleTest.php +++ b/tests/app/Module/IndividualFamiliesReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/IndividualReportModuleTest.php b/tests/app/Module/IndividualReportModuleTest.php index 803eba4ed5..c24c46f4b6 100644 --- a/tests/app/Module/IndividualReportModuleTest.php +++ b/tests/app/Module/IndividualReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/MarriageReportModuleTest.php b/tests/app/Module/MarriageReportModuleTest.php index 5ade1b5d21..7c4595e24b 100644 --- a/tests/app/Module/MarriageReportModuleTest.php +++ b/tests/app/Module/MarriageReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/MissingFactsReportModuleTest.php b/tests/app/Module/MissingFactsReportModuleTest.php index 36f7a12a0b..8bebb36609 100644 --- a/tests/app/Module/MissingFactsReportModuleTest.php +++ b/tests/app/Module/MissingFactsReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/OccupationReportModuleTest.php b/tests/app/Module/OccupationReportModuleTest.php index d0a5a9daa3..1c3df9ee61 100644 --- a/tests/app/Module/OccupationReportModuleTest.php +++ b/tests/app/Module/OccupationReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/PedigreeReportModuleTest.php b/tests/app/Module/PedigreeReportModuleTest.php index e23a30793d..ee07a4460e 100644 --- a/tests/app/Module/PedigreeReportModuleTest.php +++ b/tests/app/Module/PedigreeReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Module/RelatedIndividualsReportModuleTest.php b/tests/app/Module/RelatedIndividualsReportModuleTest.php index 58592a70c2..10535cd172 100644 --- a/tests/app/Module/RelatedIndividualsReportModuleTest.php +++ b/tests/app/Module/RelatedIndividualsReportModuleTest.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Report\HtmlRenderer; +use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Report\ReportParserGenerate; use Fisharebest\Webtrees\Report\ReportParserSetup; -use Fisharebest\Webtrees\Report\PdfRenderer; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; diff --git a/tests/app/Services/EmailServiceTest.php b/tests/app/Services/EmailServiceTest.php index f65689da8f..5428df1061 100644 --- a/tests/app/Services/EmailServiceTest.php +++ b/tests/app/Services/EmailServiceTest.php @@ -19,9 +19,9 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Site; use Fisharebest\Webtrees\TestCase; -use Fisharebest\Webtrees\Contracts\UserInterface; use function function_exists; |