diff options
| author | Greg Roach <fisharebest@gmail.com> | 2021-05-18 11:40:23 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2021-05-18 12:22:35 +0100 |
| commit | c4943cff72f95a28fbb9404e3c20b169ff098e5c (patch) | |
| tree | 524815c65f55b591d95042da034a465efd602a8c | |
| parent | 05edc7571aa62525b7dfeda19639a6f6b40f6858 (diff) | |
| download | webtrees-c4943cff72f95a28fbb9404e3c20b169ff098e5c.tar.gz webtrees-c4943cff72f95a28fbb9404e3c20b169ff098e5c.tar.bz2 webtrees-c4943cff72f95a28fbb9404e3c20b169ff098e5c.zip | |
CodeStyle
214 files changed, 362 insertions, 680 deletions
diff --git a/app/Cache.php b/app/Cache.php index 4ff92f884c..230d0c5147 100644 --- a/app/Cache.php +++ b/app/Cache.php @@ -29,8 +29,7 @@ use Symfony\Contracts\Cache\ItemInterface; */ class Cache { - /** @var CacheInterface */ - private $cache; + private CacheInterface $cache; /** * Cache constructor. diff --git a/app/CommonMark/ResponsiveTableRenderer.php b/app/CommonMark/ResponsiveTableRenderer.php index 9f7bb1a6d4..8137f2c7bb 100644 --- a/app/CommonMark/ResponsiveTableRenderer.php +++ b/app/CommonMark/ResponsiveTableRenderer.php @@ -36,8 +36,7 @@ class ResponsiveTableRenderer implements BlockRendererInterface private const WRAP_ELEMENT = 'div'; private const WRAP_ATTRIBUTES = ['class' => 'table-responsive']; - /** @var TableRenderer */ - private $table_renderer; + private TableRenderer $table_renderer; /** * ResponsiveTableRenderer constructor. diff --git a/app/CommonMark/XrefExtension.php b/app/CommonMark/XrefExtension.php index 58ac27dcaa..0d0ecfc574 100644 --- a/app/CommonMark/XrefExtension.php +++ b/app/CommonMark/XrefExtension.php @@ -28,13 +28,12 @@ use League\CommonMark\Extension\ExtensionInterface; */ class XrefExtension implements ExtensionInterface { - /** @var Tree - match XREFs in this tree */ - private $tree; + private Tree $tree; /** * MarkdownXrefParser constructor. * - * @param Tree $tree + * @param Tree $tree Match XREFs in this tree */ public function __construct(Tree $tree) { diff --git a/app/CommonMark/XrefNode.php b/app/CommonMark/XrefNode.php index 41ec8ffebc..b154c62053 100644 --- a/app/CommonMark/XrefNode.php +++ b/app/CommonMark/XrefNode.php @@ -27,9 +27,13 @@ use League\CommonMark\Inline\Element\AbstractStringContainer; */ class XrefNode extends AbstractStringContainer { - /** @var GedcomRecord */ - private $record; + private GedcomRecord $record; + /** + * XrefNode constructor. + * + * @param GedcomRecord $record + */ public function __construct(GedcomRecord $record) { parent::__construct(); diff --git a/app/CommonMark/XrefParser.php b/app/CommonMark/XrefParser.php index fd86f1ff95..ec1b25aa4a 100644 --- a/app/CommonMark/XrefParser.php +++ b/app/CommonMark/XrefParser.php @@ -34,13 +34,12 @@ use function trim; */ class XrefParser implements InlineParserInterface { - /** @var Tree - match XREFs in this tree */ - private $tree; + private Tree $tree; /** * MarkdownXrefParser constructor. * - * @param Tree $tree + * @param Tree $tree Match XREFs in this tree */ public function __construct(Tree $tree) { diff --git a/app/Factories/CacheFactory.php b/app/Factories/CacheFactory.php index e90c6492b7..a6098430c8 100644 --- a/app/Factories/CacheFactory.php +++ b/app/Factories/CacheFactory.php @@ -39,11 +39,9 @@ class CacheFactory implements CacheFactoryInterface private const FILES_TTL = 8640000; private const FILES_DIR = Webtrees::DATA_DIR . 'cache/'; - /** @var ArrayAdapter */ - private $array_adapter; + private ArrayAdapter $array_adapter; - /** @var FilesystemAdapter */ - private $filesystem_adapter; + private FilesystemAdapter $filesystem_adapter; /** * CacheFactory constructor. diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php index 420bffffa5..96c0edbb62 100644 --- a/app/GedcomRecord.php +++ b/app/GedcomRecord.php @@ -89,6 +89,7 @@ class GedcomRecord /** @var int|null Cached result */ protected $getPrimaryName; + /** @var int|null Cached result */ protected $getSecondaryName; diff --git a/app/Http/Middleware/BootModules.php b/app/Http/Middleware/BootModules.php index cec85b017a..45cf36677f 100644 --- a/app/Http/Middleware/BootModules.php +++ b/app/Http/Middleware/BootModules.php @@ -31,11 +31,9 @@ use Psr\Http\Server\RequestHandlerInterface; */ class BootModules implements MiddlewareInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var ModuleThemeInterface */ - private $theme; + private ModuleThemeInterface $theme; /** * BootModules constructor. diff --git a/app/Http/Middleware/CompressResponse.php b/app/Http/Middleware/CompressResponse.php index c17ba26d5e..1e0083fc33 100644 --- a/app/Http/Middleware/CompressResponse.php +++ b/app/Http/Middleware/CompressResponse.php @@ -51,8 +51,7 @@ class CompressResponse implements MiddlewareInterface 'image/svg+xml', ]; - /** @var StreamFactoryInterface */ - protected $stream_factory; + protected StreamFactoryInterface $stream_factory; /** * CompressResponse constructor. diff --git a/app/Http/Middleware/DoHousekeeping.php b/app/Http/Middleware/DoHousekeeping.php index a31381d70f..4d241f45a2 100644 --- a/app/Http/Middleware/DoHousekeeping.php +++ b/app/Http/Middleware/DoHousekeeping.php @@ -50,8 +50,7 @@ class DoHousekeeping implements MiddlewareInterface // Run the cleanup every N requests. private const PROBABILITY = 250; - /** @var HousekeepingService */ - private $housekeeping_service; + private HousekeepingService $housekeeping_service; /** * Housekeeping constructor. diff --git a/app/Http/Middleware/HandleExceptions.php b/app/Http/Middleware/HandleExceptions.php index dd6c9ec346..085015049d 100644 --- a/app/Http/Middleware/HandleExceptions.php +++ b/app/Http/Middleware/HandleExceptions.php @@ -54,8 +54,7 @@ class HandleExceptions implements MiddlewareInterface, StatusCodeInterface { use ViewResponseTrait; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * HandleExceptions constructor. diff --git a/app/Http/Middleware/LoadRoutes.php b/app/Http/Middleware/LoadRoutes.php index e191fefd49..71c54eb789 100644 --- a/app/Http/Middleware/LoadRoutes.php +++ b/app/Http/Middleware/LoadRoutes.php @@ -37,11 +37,9 @@ use const PHP_URL_PATH; */ class LoadRoutes implements MiddlewareInterface { - /** @var ApiRoutes */ - private $api_routes; + private ApiRoutes $api_routes; - /** @var WebRoutes */ - private $web_routes; + private WebRoutes $web_routes; /** * @param ApiRoutes $api_routes diff --git a/app/Http/Middleware/ReadConfigIni.php b/app/Http/Middleware/ReadConfigIni.php index 03ad802115..ae5acf9573 100644 --- a/app/Http/Middleware/ReadConfigIni.php +++ b/app/Http/Middleware/ReadConfigIni.php @@ -34,8 +34,7 @@ use function parse_ini_file; */ class ReadConfigIni implements MiddlewareInterface { - /** @var SetupWizard */ - private $setup_wizard; + private SetupWizard $setup_wizard; /** * @param SetupWizard $setup_wizard diff --git a/app/Http/Middleware/Router.php b/app/Http/Middleware/Router.php index b4294ab287..ee4dd5e11d 100644 --- a/app/Http/Middleware/Router.php +++ b/app/Http/Middleware/Router.php @@ -41,14 +41,11 @@ use function str_contains; */ class Router implements MiddlewareInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var RouterContainer */ - private $router_container; + private RouterContainer $router_container; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * Router constructor. @@ -57,8 +54,11 @@ class Router implements MiddlewareInterface * @param RouterContainer $router_container * @param TreeService $tree_service */ - public function __construct(ModuleService $module_service, RouterContainer $router_container, TreeService $tree_service) - { + public function __construct( + ModuleService $module_service, + RouterContainer $router_container, + TreeService $tree_service + ) { $this->module_service = $module_service; $this->router_container = $router_container; $this->tree_service = $tree_service; diff --git a/app/Http/Middleware/UpdateDatabaseSchema.php b/app/Http/Middleware/UpdateDatabaseSchema.php index 48c83720e3..99492130aa 100644 --- a/app/Http/Middleware/UpdateDatabaseSchema.php +++ b/app/Http/Middleware/UpdateDatabaseSchema.php @@ -31,8 +31,7 @@ use Psr\Http\Server\RequestHandlerInterface; */ class UpdateDatabaseSchema implements MiddlewareInterface { - /** @var MigrationService */ - private $migration_service; + private MigrationService $migration_service; /** * @param MigrationService $migration_service diff --git a/app/Http/Middleware/UseLanguage.php b/app/Http/Middleware/UseLanguage.php index f290466019..4d1a4d519d 100644 --- a/app/Http/Middleware/UseLanguage.php +++ b/app/Http/Middleware/UseLanguage.php @@ -38,8 +38,7 @@ use Psr\Http\Server\RequestHandlerInterface; */ class UseLanguage implements MiddlewareInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * UseTheme constructor. diff --git a/app/Http/Middleware/UseTheme.php b/app/Http/Middleware/UseTheme.php index 4102feec02..ae4c230441 100644 --- a/app/Http/Middleware/UseTheme.php +++ b/app/Http/Middleware/UseTheme.php @@ -37,8 +37,7 @@ use function app; */ class UseTheme implements MiddlewareInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * UseTheme constructor. diff --git a/app/Http/RequestHandlers/AbstractAutocompleteHandler.php b/app/Http/RequestHandlers/AbstractAutocompleteHandler.php index 547478eea7..a4648a101a 100644 --- a/app/Http/RequestHandlers/AbstractAutocompleteHandler.php +++ b/app/Http/RequestHandlers/AbstractAutocompleteHandler.php @@ -38,8 +38,7 @@ abstract class AbstractAutocompleteHandler implements RequestHandlerInterface // Tell the browser to cache the results protected const CACHE_LIFE = 1200; - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * @param SearchService $search_service diff --git a/app/Http/RequestHandlers/AccountDelete.php b/app/Http/RequestHandlers/AccountDelete.php index 99ebaff6b8..b0b906db35 100644 --- a/app/Http/RequestHandlers/AccountDelete.php +++ b/app/Http/RequestHandlers/AccountDelete.php @@ -36,8 +36,7 @@ use function route; */ class AccountDelete implements RequestHandlerInterface { - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * AccountController constructor. diff --git a/app/Http/RequestHandlers/AccountEdit.php b/app/Http/RequestHandlers/AccountEdit.php index 9e16f9bb6b..ae14453eaf 100644 --- a/app/Http/RequestHandlers/AccountEdit.php +++ b/app/Http/RequestHandlers/AccountEdit.php @@ -43,11 +43,9 @@ class AccountEdit implements RequestHandlerInterface { use ViewResponseTrait; - /** @var MessageService */ - private $message_service; + private MessageService $message_service; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * AccountEdit constructor. diff --git a/app/Http/RequestHandlers/AccountUpdate.php b/app/Http/RequestHandlers/AccountUpdate.php index 6f526f81d7..19f6f0dae3 100644 --- a/app/Http/RequestHandlers/AccountUpdate.php +++ b/app/Http/RequestHandlers/AccountUpdate.php @@ -38,8 +38,7 @@ use function route; */ class AccountUpdate implements RequestHandlerInterface { - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * AccountController constructor. diff --git a/app/Http/RequestHandlers/AddChildToFamilyAction.php b/app/Http/RequestHandlers/AddChildToFamilyAction.php index 76afb028c9..e86c72a5ec 100644 --- a/app/Http/RequestHandlers/AddChildToFamilyAction.php +++ b/app/Http/RequestHandlers/AddChildToFamilyAction.php @@ -38,8 +38,7 @@ use function redirect; */ class AddChildToFamilyAction implements RequestHandlerInterface { - /** @var GedcomEditService */ - private $gedcom_edit_service; + private GedcomEditService $gedcom_edit_service; /** * AddChildToFamilyAction constructor. diff --git a/app/Http/RequestHandlers/AddChildToIndividualAction.php b/app/Http/RequestHandlers/AddChildToIndividualAction.php index 016367a58e..d1cc7eba08 100644 --- a/app/Http/RequestHandlers/AddChildToIndividualAction.php +++ b/app/Http/RequestHandlers/AddChildToIndividualAction.php @@ -36,8 +36,7 @@ use function redirect; */ class AddChildToIndividualAction implements RequestHandlerInterface { - /** @var GedcomEditService */ - private $gedcom_edit_service; + private GedcomEditService $gedcom_edit_service; /** * AddChildToFamilyAction constructor. diff --git a/app/Http/RequestHandlers/AddMediaFileAction.php b/app/Http/RequestHandlers/AddMediaFileAction.php index 90fa17ff61..3e46441ea7 100644 --- a/app/Http/RequestHandlers/AddMediaFileAction.php +++ b/app/Http/RequestHandlers/AddMediaFileAction.php @@ -39,11 +39,9 @@ use function route; */ class AddMediaFileAction implements RequestHandlerInterface { - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * AddMediaFileAction constructor. diff --git a/app/Http/RequestHandlers/AddMediaFileModal.php b/app/Http/RequestHandlers/AddMediaFileModal.php index 0e3900dd5f..cc93bc44f0 100644 --- a/app/Http/RequestHandlers/AddMediaFileModal.php +++ b/app/Http/RequestHandlers/AddMediaFileModal.php @@ -39,8 +39,7 @@ use function view; */ class AddMediaFileModal implements RequestHandlerInterface { - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; /** * AddMediaFileModal constructor. diff --git a/app/Http/RequestHandlers/AddParentToIndividualAction.php b/app/Http/RequestHandlers/AddParentToIndividualAction.php index 8a2f2100d4..527ef37166 100644 --- a/app/Http/RequestHandlers/AddParentToIndividualAction.php +++ b/app/Http/RequestHandlers/AddParentToIndividualAction.php @@ -36,8 +36,7 @@ use function redirect; */ class AddParentToIndividualAction implements RequestHandlerInterface { - /** @var GedcomEditService */ - private $gedcom_edit_service; + private GedcomEditService $gedcom_edit_service; /** * AddChildToFamilyAction constructor. diff --git a/app/Http/RequestHandlers/AddSpouseToFamilyAction.php b/app/Http/RequestHandlers/AddSpouseToFamilyAction.php index d1476dfbed..e0de3029c7 100644 --- a/app/Http/RequestHandlers/AddSpouseToFamilyAction.php +++ b/app/Http/RequestHandlers/AddSpouseToFamilyAction.php @@ -36,8 +36,7 @@ use function redirect; */ class AddSpouseToFamilyAction implements RequestHandlerInterface { - /** @var GedcomEditService */ - private $gedcom_edit_service; + private GedcomEditService $gedcom_edit_service; /** * AddChildToFamilyAction constructor. diff --git a/app/Http/RequestHandlers/AddSpouseToIndividualAction.php b/app/Http/RequestHandlers/AddSpouseToIndividualAction.php index 1049b14197..ca0004c157 100644 --- a/app/Http/RequestHandlers/AddSpouseToIndividualAction.php +++ b/app/Http/RequestHandlers/AddSpouseToIndividualAction.php @@ -36,8 +36,7 @@ use function redirect; */ class AddSpouseToIndividualAction implements RequestHandlerInterface { - /** @var GedcomEditService */ - private $gedcom_edit_service; + private GedcomEditService $gedcom_edit_service; /** * AddChildToFamilyAction constructor. diff --git a/app/Http/RequestHandlers/AddUnlinkedAction.php b/app/Http/RequestHandlers/AddUnlinkedAction.php index 58b16c7fe6..b45a0fa4cf 100644 --- a/app/Http/RequestHandlers/AddUnlinkedAction.php +++ b/app/Http/RequestHandlers/AddUnlinkedAction.php @@ -33,8 +33,7 @@ use function redirect; */ class AddUnlinkedAction implements RequestHandlerInterface { - /** @var GedcomEditService */ - private $gedcom_edit_service; + private GedcomEditService $gedcom_edit_service; /** * AddChildToFamilyAction constructor. diff --git a/app/Http/RequestHandlers/BroadcastAction.php b/app/Http/RequestHandlers/BroadcastAction.php index 967b47a37c..fdffd1ab2c 100644 --- a/app/Http/RequestHandlers/BroadcastAction.php +++ b/app/Http/RequestHandlers/BroadcastAction.php @@ -38,8 +38,7 @@ class BroadcastAction implements RequestHandlerInterface { use ViewResponseTrait; - /** @var MessageService */ - private $message_service; + private MessageService $message_service; /** * MessagePage constructor. diff --git a/app/Http/RequestHandlers/BroadcastPage.php b/app/Http/RequestHandlers/BroadcastPage.php index bebd72734a..b84467bdf4 100644 --- a/app/Http/RequestHandlers/BroadcastPage.php +++ b/app/Http/RequestHandlers/BroadcastPage.php @@ -33,8 +33,7 @@ class BroadcastPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var MessageService */ - private $message_service; + private MessageService $message_service; /** * MessagePage constructor. diff --git a/app/Http/RequestHandlers/CalendarEvents.php b/app/Http/RequestHandlers/CalendarEvents.php index d1d06f39fc..3bdce885a6 100644 --- a/app/Http/RequestHandlers/CalendarEvents.php +++ b/app/Http/RequestHandlers/CalendarEvents.php @@ -54,8 +54,7 @@ use function view; */ class CalendarEvents implements RequestHandlerInterface { - /** @var CalendarService */ - private $calendar_service; + private CalendarService $calendar_service; /** * CalendarPage constructor. diff --git a/app/Http/RequestHandlers/CalendarPage.php b/app/Http/RequestHandlers/CalendarPage.php index b858094b0d..fe460b1649 100644 --- a/app/Http/RequestHandlers/CalendarPage.php +++ b/app/Http/RequestHandlers/CalendarPage.php @@ -38,11 +38,9 @@ class CalendarPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var CalendarService */ - private $calendar_service; + private CalendarService $calendar_service; - /** @var LocalizationService */ - private $localization_service; + private LocalizationService $localization_service; /** * CalendarPage constructor. diff --git a/app/Http/RequestHandlers/CleanDataFolder.php b/app/Http/RequestHandlers/CleanDataFolder.php index 4a0ae7ca7c..cea279a8e5 100644 --- a/app/Http/RequestHandlers/CleanDataFolder.php +++ b/app/Http/RequestHandlers/CleanDataFolder.php @@ -39,8 +39,7 @@ class CleanDataFolder implements RequestHandlerInterface { use ViewResponseTrait; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * CleanDataFolder constructor. diff --git a/app/Http/RequestHandlers/ContactAction.php b/app/Http/RequestHandlers/ContactAction.php index f186a55aca..a9f6c94b2f 100644 --- a/app/Http/RequestHandlers/ContactAction.php +++ b/app/Http/RequestHandlers/ContactAction.php @@ -49,17 +49,13 @@ class ContactAction implements RequestHandlerInterface { use ViewResponseTrait; - /** @var CaptchaService */ - private $captcha_service; + private CaptchaService $captcha_service; - /** @var EmailService */ - private $email_service; + private EmailService $email_service; - /** @var MessageService */ - private $message_service; + private MessageService $message_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * MessagePage constructor. diff --git a/app/Http/RequestHandlers/ContactPage.php b/app/Http/RequestHandlers/ContactPage.php index 78a785898e..709582a4d0 100644 --- a/app/Http/RequestHandlers/ContactPage.php +++ b/app/Http/RequestHandlers/ContactPage.php @@ -41,14 +41,11 @@ class ContactPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var CaptchaService */ - private $captcha_service; + private CaptchaService $captcha_service; - /** @var MessageService */ - private $message_service; + private MessageService $message_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * MessagePage constructor. diff --git a/app/Http/RequestHandlers/CopyFact.php b/app/Http/RequestHandlers/CopyFact.php index 26deeb4484..0d77e4a80c 100644 --- a/app/Http/RequestHandlers/CopyFact.php +++ b/app/Http/RequestHandlers/CopyFact.php @@ -38,8 +38,7 @@ use function response; */ class CopyFact implements RequestHandlerInterface { - /** @var ClipboardService */ - private $clipboard_service; + private ClipboardService $clipboard_service; /** * CopyFact constructor. diff --git a/app/Http/RequestHandlers/CreateMediaObjectAction.php b/app/Http/RequestHandlers/CreateMediaObjectAction.php index 120bfe597c..bcc516b3f2 100644 --- a/app/Http/RequestHandlers/CreateMediaObjectAction.php +++ b/app/Http/RequestHandlers/CreateMediaObjectAction.php @@ -38,11 +38,9 @@ use function response; */ class CreateMediaObjectAction implements RequestHandlerInterface { - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * CreateMediaObjectAction constructor. diff --git a/app/Http/RequestHandlers/CreateMediaObjectFromFile.php b/app/Http/RequestHandlers/CreateMediaObjectFromFile.php index 468413aa86..b6db5cedcc 100644 --- a/app/Http/RequestHandlers/CreateMediaObjectFromFile.php +++ b/app/Http/RequestHandlers/CreateMediaObjectFromFile.php @@ -33,11 +33,9 @@ use function assert; */ class CreateMediaObjectFromFile implements RequestHandlerInterface { - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * CreateMediaObjectFromFileAction constructor. diff --git a/app/Http/RequestHandlers/CreateMediaObjectModal.php b/app/Http/RequestHandlers/CreateMediaObjectModal.php index 9e3e177814..abfe4d29f9 100644 --- a/app/Http/RequestHandlers/CreateMediaObjectModal.php +++ b/app/Http/RequestHandlers/CreateMediaObjectModal.php @@ -33,8 +33,7 @@ use function assert; */ class CreateMediaObjectModal implements RequestHandlerInterface { - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; /** * CreateMediaObjectModal constructor. diff --git a/app/Http/RequestHandlers/CreateTreeAction.php b/app/Http/RequestHandlers/CreateTreeAction.php index 0a0b6384f3..fbf4607980 100644 --- a/app/Http/RequestHandlers/CreateTreeAction.php +++ b/app/Http/RequestHandlers/CreateTreeAction.php @@ -36,8 +36,7 @@ use function route; */ class CreateTreeAction implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * CreateTreePage constructor. diff --git a/app/Http/RequestHandlers/CreateTreePage.php b/app/Http/RequestHandlers/CreateTreePage.php index d960a0c42c..a6b39c7b36 100644 --- a/app/Http/RequestHandlers/CreateTreePage.php +++ b/app/Http/RequestHandlers/CreateTreePage.php @@ -33,8 +33,7 @@ class CreateTreePage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * CreateTreePage constructor. diff --git a/app/Http/RequestHandlers/DataFixChoose.php b/app/Http/RequestHandlers/DataFixChoose.php index 48c08f855c..ec85ec0c6b 100644 --- a/app/Http/RequestHandlers/DataFixChoose.php +++ b/app/Http/RequestHandlers/DataFixChoose.php @@ -39,8 +39,7 @@ class DataFixChoose implements RequestHandlerInterface { use ViewResponseTrait; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * DataFix constructor. diff --git a/app/Http/RequestHandlers/DataFixData.php b/app/Http/RequestHandlers/DataFixData.php index b1ef02716b..e4d65539b2 100644 --- a/app/Http/RequestHandlers/DataFixData.php +++ b/app/Http/RequestHandlers/DataFixData.php @@ -41,14 +41,11 @@ use function view; */ class DataFixData implements RequestHandlerInterface { - /** @var DataFixService */ - private $data_fix_service; + private DataFixService $data_fix_service; - /** @var DatatablesService */ - private $datatables_service; + private DatatablesService $datatables_service; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * DataFix constructor. diff --git a/app/Http/RequestHandlers/DataFixPage.php b/app/Http/RequestHandlers/DataFixPage.php index c549dcec31..4f7c4a5279 100644 --- a/app/Http/RequestHandlers/DataFixPage.php +++ b/app/Http/RequestHandlers/DataFixPage.php @@ -41,8 +41,7 @@ class DataFixPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * DataFix constructor. diff --git a/app/Http/RequestHandlers/DataFixPreview.php b/app/Http/RequestHandlers/DataFixPreview.php index 519caed7bd..5bcd235c1b 100644 --- a/app/Http/RequestHandlers/DataFixPreview.php +++ b/app/Http/RequestHandlers/DataFixPreview.php @@ -39,8 +39,7 @@ class DataFixPreview implements RequestHandlerInterface { use ViewResponseTrait; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * DataFix constructor. diff --git a/app/Http/RequestHandlers/DataFixSelect.php b/app/Http/RequestHandlers/DataFixSelect.php index 25f7cb12e4..89f75f8dc4 100644 --- a/app/Http/RequestHandlers/DataFixSelect.php +++ b/app/Http/RequestHandlers/DataFixSelect.php @@ -35,8 +35,7 @@ use function route; */ class DataFixSelect implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * DataFix constructor. diff --git a/app/Http/RequestHandlers/DataFixUpdate.php b/app/Http/RequestHandlers/DataFixUpdate.php index 57f1726f5f..131e7ed84b 100644 --- a/app/Http/RequestHandlers/DataFixUpdate.php +++ b/app/Http/RequestHandlers/DataFixUpdate.php @@ -36,8 +36,7 @@ use function response; */ class DataFixUpdate implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * DataFix constructor. diff --git a/app/Http/RequestHandlers/DataFixUpdateAll.php b/app/Http/RequestHandlers/DataFixUpdateAll.php index 0742dddd17..1f77744bd9 100644 --- a/app/Http/RequestHandlers/DataFixUpdateAll.php +++ b/app/Http/RequestHandlers/DataFixUpdateAll.php @@ -45,11 +45,9 @@ class DataFixUpdateAll implements RequestHandlerInterface // Process this number of records in each HTTP request private const CHUNK_SIZE = 250; - /** @var DataFixService */ - private $data_fix_service; + private DataFixService $data_fix_service; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * DataFix constructor. diff --git a/app/Http/RequestHandlers/DeleteTreeAction.php b/app/Http/RequestHandlers/DeleteTreeAction.php index 2312706f9e..596c1d898d 100644 --- a/app/Http/RequestHandlers/DeleteTreeAction.php +++ b/app/Http/RequestHandlers/DeleteTreeAction.php @@ -36,8 +36,7 @@ use function response; */ class DeleteTreeAction implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * CreateTreePage constructor. diff --git a/app/Http/RequestHandlers/DeleteUser.php b/app/Http/RequestHandlers/DeleteUser.php index 916b927f9b..27d0012258 100644 --- a/app/Http/RequestHandlers/DeleteUser.php +++ b/app/Http/RequestHandlers/DeleteUser.php @@ -35,8 +35,7 @@ use function response; */ class DeleteUser implements RequestHandlerInterface { - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * @param UserService $user_service diff --git a/app/Http/RequestHandlers/EditFactAction.php b/app/Http/RequestHandlers/EditFactAction.php index 9cae393376..a2ddc7dca2 100644 --- a/app/Http/RequestHandlers/EditFactAction.php +++ b/app/Http/RequestHandlers/EditFactAction.php @@ -40,11 +40,9 @@ use function redirect; */ class EditFactAction implements RequestHandlerInterface { - /** @var GedcomEditService */ - private $gedcom_edit_service; + private GedcomEditService $gedcom_edit_service; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * EditFactAction constructor. diff --git a/app/Http/RequestHandlers/EditMediaFileAction.php b/app/Http/RequestHandlers/EditMediaFileAction.php index d9daac825c..a82c1c176b 100644 --- a/app/Http/RequestHandlers/EditMediaFileAction.php +++ b/app/Http/RequestHandlers/EditMediaFileAction.php @@ -48,11 +48,9 @@ use function trim; */ class EditMediaFileAction implements RequestHandlerInterface { - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * EditMediaFileAction constructor. diff --git a/app/Http/RequestHandlers/EditMediaFileModal.php b/app/Http/RequestHandlers/EditMediaFileModal.php index 9a6ecdb643..cf4c10dbb1 100644 --- a/app/Http/RequestHandlers/EditMediaFileModal.php +++ b/app/Http/RequestHandlers/EditMediaFileModal.php @@ -40,8 +40,7 @@ use function view; */ class EditMediaFileModal implements RequestHandlerInterface { - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; /** * EditMediaFileModal constructor. diff --git a/app/Http/RequestHandlers/EditRecordAction.php b/app/Http/RequestHandlers/EditRecordAction.php index d8b1949590..40fabcf911 100644 --- a/app/Http/RequestHandlers/EditRecordAction.php +++ b/app/Http/RequestHandlers/EditRecordAction.php @@ -37,8 +37,7 @@ use function redirect; */ class EditRecordAction implements RequestHandlerInterface { - /** @var GedcomEditService */ - private $gedcom_edit_service; + private GedcomEditService $gedcom_edit_service; /** * EditFactAction constructor. diff --git a/app/Http/RequestHandlers/EmailPreferencesAction.php b/app/Http/RequestHandlers/EmailPreferencesAction.php index 012f6f40a4..2c09fc7278 100644 --- a/app/Http/RequestHandlers/EmailPreferencesAction.php +++ b/app/Http/RequestHandlers/EmailPreferencesAction.php @@ -38,8 +38,7 @@ use function route; */ class EmailPreferencesAction implements RequestHandlerInterface { - /** @var EmailService */ - private $email_service; + private EmailService $email_service; /** * AdminSiteController constructor. diff --git a/app/Http/RequestHandlers/EmailPreferencesPage.php b/app/Http/RequestHandlers/EmailPreferencesPage.php index 827c72585e..1c02c3076f 100644 --- a/app/Http/RequestHandlers/EmailPreferencesPage.php +++ b/app/Http/RequestHandlers/EmailPreferencesPage.php @@ -43,8 +43,7 @@ class EmailPreferencesPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var EmailService */ - private $email_service; + private EmailService $email_service; /** * AdminSiteController constructor. diff --git a/app/Http/RequestHandlers/ExportGedcomClient.php b/app/Http/RequestHandlers/ExportGedcomClient.php index bdeae8562f..4b8631f52d 100644 --- a/app/Http/RequestHandlers/ExportGedcomClient.php +++ b/app/Http/RequestHandlers/ExportGedcomClient.php @@ -56,8 +56,7 @@ class ExportGedcomClient implements RequestHandlerInterface { use ViewResponseTrait; - /** @var GedcomExportService */ - private $gedcom_export_service; + private GedcomExportService $gedcom_export_service; /** * ExportGedcomServer constructor. diff --git a/app/Http/RequestHandlers/ExportGedcomServer.php b/app/Http/RequestHandlers/ExportGedcomServer.php index 0321ee92b7..9daeb5d362 100644 --- a/app/Http/RequestHandlers/ExportGedcomServer.php +++ b/app/Http/RequestHandlers/ExportGedcomServer.php @@ -51,8 +51,7 @@ class ExportGedcomServer implements RequestHandlerInterface { use ViewResponseTrait; - /** @var GedcomExportService */ - private $gedcom_export_service; + private GedcomExportService $gedcom_export_service; /** * ExportGedcomServer constructor. diff --git a/app/Http/RequestHandlers/FamilyPage.php b/app/Http/RequestHandlers/FamilyPage.php index 468a9643f3..d78e53243a 100644 --- a/app/Http/RequestHandlers/FamilyPage.php +++ b/app/Http/RequestHandlers/FamilyPage.php @@ -46,8 +46,7 @@ class FamilyPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var ClipboardService */ - private $clipboard_service; + private ClipboardService $clipboard_service; /** * FamilyPage constructor. diff --git a/app/Http/RequestHandlers/FindDuplicateRecords.php b/app/Http/RequestHandlers/FindDuplicateRecords.php index 6628cb5117..0abd9a6adf 100644 --- a/app/Http/RequestHandlers/FindDuplicateRecords.php +++ b/app/Http/RequestHandlers/FindDuplicateRecords.php @@ -37,8 +37,7 @@ class FindDuplicateRecords implements RequestHandlerInterface { use ViewResponseTrait; - /** @var AdminService */ - private $admin_service; + private AdminService $admin_service; /** * @param AdminService $admin_service diff --git a/app/Http/RequestHandlers/FixLevel0MediaAction.php b/app/Http/RequestHandlers/FixLevel0MediaAction.php index 6421e14733..fa929ab766 100644 --- a/app/Http/RequestHandlers/FixLevel0MediaAction.php +++ b/app/Http/RequestHandlers/FixLevel0MediaAction.php @@ -32,8 +32,7 @@ use function response; */ class FixLevel0MediaAction implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * FixLevel0MediaController constructor. diff --git a/app/Http/RequestHandlers/FixLevel0MediaData.php b/app/Http/RequestHandlers/FixLevel0MediaData.php index 8a74dea656..c12929bfd1 100644 --- a/app/Http/RequestHandlers/FixLevel0MediaData.php +++ b/app/Http/RequestHandlers/FixLevel0MediaData.php @@ -44,11 +44,9 @@ use function view; */ class FixLevel0MediaData implements RequestHandlerInterface { - /** @var DatatablesService */ - private $datatables_service; + private DatatablesService $datatables_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * FixLevel0MediaController constructor. diff --git a/app/Http/RequestHandlers/GedcomLoad.php b/app/Http/RequestHandlers/GedcomLoad.php index c096398146..e6231b85df 100644 --- a/app/Http/RequestHandlers/GedcomLoad.php +++ b/app/Http/RequestHandlers/GedcomLoad.php @@ -55,11 +55,9 @@ class GedcomLoad implements RequestHandlerInterface use ViewResponseTrait; use DetectsConcurrencyErrors; - /** @var TimeoutService */ - private $timeout_service; + private TimeoutService $timeout_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * GedcomLoad constructor. diff --git a/app/Http/RequestHandlers/HelpText.php b/app/Http/RequestHandlers/HelpText.php index b51f0dfed7..af75993933 100644 --- a/app/Http/RequestHandlers/HelpText.php +++ b/app/Http/RequestHandlers/HelpText.php @@ -164,8 +164,7 @@ class HelpText implements RequestHandlerInterface ], ]; - /** @var LocalizationService */ - private $localisation_service; + private LocalizationService $localisation_service; /** * HelpText constructor. diff --git a/app/Http/RequestHandlers/HomePage.php b/app/Http/RequestHandlers/HomePage.php index 9dc14f1750..1dafe20b91 100644 --- a/app/Http/RequestHandlers/HomePage.php +++ b/app/Http/RequestHandlers/HomePage.php @@ -39,8 +39,7 @@ class HomePage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * HomePage constructor. diff --git a/app/Http/RequestHandlers/ImportGedcomAction.php b/app/Http/RequestHandlers/ImportGedcomAction.php index 439865f5b3..a0e53788e4 100644 --- a/app/Http/RequestHandlers/ImportGedcomAction.php +++ b/app/Http/RequestHandlers/ImportGedcomAction.php @@ -46,8 +46,7 @@ use const UPLOAD_ERR_OK; */ class ImportGedcomAction implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; public function __construct(TreeService $tree_service) { diff --git a/app/Http/RequestHandlers/ImportGedcomPage.php b/app/Http/RequestHandlers/ImportGedcomPage.php index b0882fec45..c411700aaf 100644 --- a/app/Http/RequestHandlers/ImportGedcomPage.php +++ b/app/Http/RequestHandlers/ImportGedcomPage.php @@ -38,8 +38,7 @@ class ImportGedcomPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var AdminService */ - private $admin_service; + private AdminService $admin_service; /** * @param AdminService $admin_service diff --git a/app/Http/RequestHandlers/ImportThumbnailsAction.php b/app/Http/RequestHandlers/ImportThumbnailsAction.php index a0095bc67b..eb2a2475bb 100644 --- a/app/Http/RequestHandlers/ImportThumbnailsAction.php +++ b/app/Http/RequestHandlers/ImportThumbnailsAction.php @@ -43,11 +43,9 @@ use function substr; */ class ImportThumbnailsAction implements RequestHandlerInterface { - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * ImportThumbnailsController constructor. diff --git a/app/Http/RequestHandlers/ImportThumbnailsData.php b/app/Http/RequestHandlers/ImportThumbnailsData.php index b0ded5aa52..b2d6496c30 100644 --- a/app/Http/RequestHandlers/ImportThumbnailsData.php +++ b/app/Http/RequestHandlers/ImportThumbnailsData.php @@ -62,8 +62,7 @@ class ImportThumbnailsData implements RequestHandlerInterface { private const FINGERPRINT_PIXELS = 10; - /** @var SearchService */ - private $search_service; + private SearchService $search_service; /** * ImportThumbnailsData constructor. diff --git a/app/Http/RequestHandlers/IndividualPage.php b/app/Http/RequestHandlers/IndividualPage.php index d60f342a2a..550a3e483a 100644 --- a/app/Http/RequestHandlers/IndividualPage.php +++ b/app/Http/RequestHandlers/IndividualPage.php @@ -62,14 +62,11 @@ class IndividualPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var ClipboardService */ - private $clipboard_service; + private ClipboardService $clipboard_service; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * IndividualPage constructor. diff --git a/app/Http/RequestHandlers/LinkSpouseToIndividualAction.php b/app/Http/RequestHandlers/LinkSpouseToIndividualAction.php index 9bda3def19..d8c76b1f42 100644 --- a/app/Http/RequestHandlers/LinkSpouseToIndividualAction.php +++ b/app/Http/RequestHandlers/LinkSpouseToIndividualAction.php @@ -36,8 +36,7 @@ use function redirect; */ class LinkSpouseToIndividualAction implements RequestHandlerInterface { - /** @var GedcomEditService */ - private $gedcom_edit_service; + private GedcomEditService $gedcom_edit_service; /** * AddChildToFamilyAction constructor. diff --git a/app/Http/RequestHandlers/LoginAction.php b/app/Http/RequestHandlers/LoginAction.php index 7ab0b47dba..fb4d823bdf 100644 --- a/app/Http/RequestHandlers/LoginAction.php +++ b/app/Http/RequestHandlers/LoginAction.php @@ -41,11 +41,9 @@ use function route; */ class LoginAction implements RequestHandlerInterface { - /** @var UpgradeService */ - private $upgrade_service; + private UpgradeService $upgrade_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * LoginController constructor. diff --git a/app/Http/RequestHandlers/LoginPage.php b/app/Http/RequestHandlers/LoginPage.php index 8e24b74bfc..584a3cdb6f 100644 --- a/app/Http/RequestHandlers/LoginPage.php +++ b/app/Http/RequestHandlers/LoginPage.php @@ -36,8 +36,7 @@ class LoginPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * LoginPage constructor. diff --git a/app/Http/RequestHandlers/ManageMediaData.php b/app/Http/RequestHandlers/ManageMediaData.php index a2c3087fe8..8295ce1c16 100644 --- a/app/Http/RequestHandlers/ManageMediaData.php +++ b/app/Http/RequestHandlers/ManageMediaData.php @@ -57,14 +57,11 @@ use function view; */ class ManageMediaData implements RequestHandlerInterface { - /** @var DatatablesService */ - private $datatables_service; + private DatatablesService $datatables_service; - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * MediaController constructor. diff --git a/app/Http/RequestHandlers/ManageMediaPage.php b/app/Http/RequestHandlers/ManageMediaPage.php index eaabad8b4d..b334d97615 100644 --- a/app/Http/RequestHandlers/ManageMediaPage.php +++ b/app/Http/RequestHandlers/ManageMediaPage.php @@ -34,8 +34,7 @@ class ManageMediaPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; /** * MediaController constructor. diff --git a/app/Http/RequestHandlers/ManageTrees.php b/app/Http/RequestHandlers/ManageTrees.php index b2ff6dd924..1e68406856 100644 --- a/app/Http/RequestHandlers/ManageTrees.php +++ b/app/Http/RequestHandlers/ManageTrees.php @@ -39,11 +39,9 @@ class ManageTrees implements RequestHandlerInterface { use ViewResponseTrait; - /** @var AdminService */ - private $admin_service; + private AdminService $admin_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param AdminService $admin_service diff --git a/app/Http/RequestHandlers/MapDataDelete.php b/app/Http/RequestHandlers/MapDataDelete.php index 2b5f9ed740..ba7c7b3949 100644 --- a/app/Http/RequestHandlers/MapDataDelete.php +++ b/app/Http/RequestHandlers/MapDataDelete.php @@ -32,8 +32,7 @@ use function route; */ class MapDataDelete implements RequestHandlerInterface { - /** @var MapDataService */ - private $map_data_service; + private MapDataService $map_data_service; /** * Dependency injection. diff --git a/app/Http/RequestHandlers/MapDataExportCSV.php b/app/Http/RequestHandlers/MapDataExportCSV.php index 58875337b2..896c2fcea6 100644 --- a/app/Http/RequestHandlers/MapDataExportCSV.php +++ b/app/Http/RequestHandlers/MapDataExportCSV.php @@ -49,8 +49,7 @@ use function stream_get_contents; */ class MapDataExportCSV implements RequestHandlerInterface { - /** @var MapDataService */ - private $map_data_service; + private MapDataService $map_data_service; /** * Dependency injection. diff --git a/app/Http/RequestHandlers/MapDataExportGeoJson.php b/app/Http/RequestHandlers/MapDataExportGeoJson.php index 9f3fa77221..a8a0d3bdeb 100644 --- a/app/Http/RequestHandlers/MapDataExportGeoJson.php +++ b/app/Http/RequestHandlers/MapDataExportGeoJson.php @@ -40,8 +40,7 @@ use function response; */ class MapDataExportGeoJson implements RequestHandlerInterface { - /** @var MapDataService */ - private $map_data_service; + private MapDataService $map_data_service; /** * Dependency injection. diff --git a/app/Http/RequestHandlers/MapDataList.php b/app/Http/RequestHandlers/MapDataList.php index 5e916152c0..5ec1d8cac1 100644 --- a/app/Http/RequestHandlers/MapDataList.php +++ b/app/Http/RequestHandlers/MapDataList.php @@ -42,14 +42,11 @@ class MapDataList implements RequestHandlerInterface { use ViewResponseTrait; - /** @var MapDataService */ - private $map_data_service; + private MapDataService $map_data_service; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * Dependency injection. diff --git a/app/Http/RequestHandlers/Masquerade.php b/app/Http/RequestHandlers/Masquerade.php index 88976c256e..3ff5775b4a 100644 --- a/app/Http/RequestHandlers/Masquerade.php +++ b/app/Http/RequestHandlers/Masquerade.php @@ -35,8 +35,7 @@ use function response; */ class Masquerade implements RequestHandlerInterface { - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * @param UserService $user_service diff --git a/app/Http/RequestHandlers/MediaPage.php b/app/Http/RequestHandlers/MediaPage.php index 2e1a80242d..03df46ee8a 100644 --- a/app/Http/RequestHandlers/MediaPage.php +++ b/app/Http/RequestHandlers/MediaPage.php @@ -43,8 +43,7 @@ class MediaPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var ClipboardService */ - private $clipboard_service; + private ClipboardService $clipboard_service; /** * MediaPage constructor. diff --git a/app/Http/RequestHandlers/MergeTreesAction.php b/app/Http/RequestHandlers/MergeTreesAction.php index b4d90bb62c..f23f9aa53b 100644 --- a/app/Http/RequestHandlers/MergeTreesAction.php +++ b/app/Http/RequestHandlers/MergeTreesAction.php @@ -40,11 +40,9 @@ use function route; */ class MergeTreesAction implements RequestHandlerInterface { - /** @var AdminService */ - private $admin_service; + private AdminService $admin_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * AdminTreesController constructor. diff --git a/app/Http/RequestHandlers/MergeTreesPage.php b/app/Http/RequestHandlers/MergeTreesPage.php index c5c680c71a..ea61f1bf13 100644 --- a/app/Http/RequestHandlers/MergeTreesPage.php +++ b/app/Http/RequestHandlers/MergeTreesPage.php @@ -34,11 +34,9 @@ class MergeTreesPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var AdminService */ - private $admin_service; + private AdminService $admin_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * AdminTreesController constructor. diff --git a/app/Http/RequestHandlers/MessageAction.php b/app/Http/RequestHandlers/MessageAction.php index da0253fc9a..b7e79c43f9 100644 --- a/app/Http/RequestHandlers/MessageAction.php +++ b/app/Http/RequestHandlers/MessageAction.php @@ -43,11 +43,9 @@ class MessageAction implements RequestHandlerInterface { use ViewResponseTrait; - /** @var MessageService */ - private $message_service; + private MessageService $message_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * MessagePage constructor. diff --git a/app/Http/RequestHandlers/MessagePage.php b/app/Http/RequestHandlers/MessagePage.php index f430f140b9..58b658ab97 100644 --- a/app/Http/RequestHandlers/MessagePage.php +++ b/app/Http/RequestHandlers/MessagePage.php @@ -39,8 +39,7 @@ class MessagePage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * MessagePage constructor. diff --git a/app/Http/RequestHandlers/ModuleAction.php b/app/Http/RequestHandlers/ModuleAction.php index 6a8f78ff6b..293284f062 100644 --- a/app/Http/RequestHandlers/ModuleAction.php +++ b/app/Http/RequestHandlers/ModuleAction.php @@ -38,8 +38,7 @@ use function strtolower; */ class ModuleAction implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/ModulesAllAction.php b/app/Http/RequestHandlers/ModulesAllAction.php index 575b632d11..aa16bcc381 100644 --- a/app/Http/RequestHandlers/ModulesAllAction.php +++ b/app/Http/RequestHandlers/ModulesAllAction.php @@ -35,8 +35,7 @@ use function route; */ class ModulesAllAction implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/ModulesAllPage.php b/app/Http/RequestHandlers/ModulesAllPage.php index 49592c9c2d..11ff8dc0dc 100644 --- a/app/Http/RequestHandlers/ModulesAllPage.php +++ b/app/Http/RequestHandlers/ModulesAllPage.php @@ -33,8 +33,7 @@ class ModulesAllPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/NotePage.php b/app/Http/RequestHandlers/NotePage.php index d16d62fdf8..a972c1390a 100644 --- a/app/Http/RequestHandlers/NotePage.php +++ b/app/Http/RequestHandlers/NotePage.php @@ -44,8 +44,7 @@ class NotePage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var ClipboardService */ - private $clipboard_service; + private ClipboardService $clipboard_service; /** * NotePage constructor. diff --git a/app/Http/RequestHandlers/PasswordRequestAction.php b/app/Http/RequestHandlers/PasswordRequestAction.php index 397d128bbe..0cbb7df684 100644 --- a/app/Http/RequestHandlers/PasswordRequestAction.php +++ b/app/Http/RequestHandlers/PasswordRequestAction.php @@ -46,11 +46,9 @@ class PasswordRequestAction implements RequestHandlerInterface, StatusCodeInterf { private const TOKEN_LENGTH = 40; - /** @var EmailService */ - private $email_service; + private EmailService $email_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * PasswordRequestForm constructor. diff --git a/app/Http/RequestHandlers/PasswordResetAction.php b/app/Http/RequestHandlers/PasswordResetAction.php index 866f4c0b21..b60b63bc46 100644 --- a/app/Http/RequestHandlers/PasswordResetAction.php +++ b/app/Http/RequestHandlers/PasswordResetAction.php @@ -36,8 +36,7 @@ use Psr\Http\Server\RequestHandlerInterface; */ class PasswordResetAction implements RequestHandlerInterface, StatusCodeInterface { - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * PasswordRequestForm constructor. diff --git a/app/Http/RequestHandlers/PasswordResetPage.php b/app/Http/RequestHandlers/PasswordResetPage.php index fcc7a8c0b1..575de5fea6 100644 --- a/app/Http/RequestHandlers/PasswordResetPage.php +++ b/app/Http/RequestHandlers/PasswordResetPage.php @@ -39,8 +39,7 @@ class PasswordResetPage implements RequestHandlerInterface, StatusCodeInterface { use ViewResponseTrait; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * PasswordResetForm constructor. diff --git a/app/Http/RequestHandlers/PasteFact.php b/app/Http/RequestHandlers/PasteFact.php index 2f05039505..a45b7dc77d 100644 --- a/app/Http/RequestHandlers/PasteFact.php +++ b/app/Http/RequestHandlers/PasteFact.php @@ -36,8 +36,7 @@ use function redirect; */ class PasteFact implements RequestHandlerInterface { - /** @var ClipboardService */ - private $clipboard_service; + private ClipboardService $clipboard_service; /** * PasteFact constructor. diff --git a/app/Http/RequestHandlers/PendingChanges.php b/app/Http/RequestHandlers/PendingChanges.php index fb96586baa..bacdc2ac33 100644 --- a/app/Http/RequestHandlers/PendingChanges.php +++ b/app/Http/RequestHandlers/PendingChanges.php @@ -40,8 +40,7 @@ class PendingChanges implements RequestHandlerInterface // Some servers may not have enough resources to show all the changes. private const MAX_CHANGES = 1000; - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * PendingChanges constructor. diff --git a/app/Http/RequestHandlers/PendingChangesAcceptChange.php b/app/Http/RequestHandlers/PendingChangesAcceptChange.php index 348bf00b42..bdf2b0710e 100644 --- a/app/Http/RequestHandlers/PendingChangesAcceptChange.php +++ b/app/Http/RequestHandlers/PendingChangesAcceptChange.php @@ -36,8 +36,7 @@ use function response; */ class PendingChangesAcceptChange implements RequestHandlerInterface { - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * @param PendingChangesService $pending_changes_service diff --git a/app/Http/RequestHandlers/PendingChangesAcceptRecord.php b/app/Http/RequestHandlers/PendingChangesAcceptRecord.php index 33eea98a2a..e624dd27dc 100644 --- a/app/Http/RequestHandlers/PendingChangesAcceptRecord.php +++ b/app/Http/RequestHandlers/PendingChangesAcceptRecord.php @@ -36,8 +36,7 @@ use function response; */ class PendingChangesAcceptRecord implements RequestHandlerInterface { - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * @param PendingChangesService $pending_changes_service diff --git a/app/Http/RequestHandlers/PendingChangesAcceptTree.php b/app/Http/RequestHandlers/PendingChangesAcceptTree.php index 1e5473bf10..96fe760cd8 100644 --- a/app/Http/RequestHandlers/PendingChangesAcceptTree.php +++ b/app/Http/RequestHandlers/PendingChangesAcceptTree.php @@ -38,8 +38,7 @@ use const PHP_INT_MAX; */ class PendingChangesAcceptTree implements RequestHandlerInterface { - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * @param PendingChangesService $pending_changes_service diff --git a/app/Http/RequestHandlers/PendingChangesLogData.php b/app/Http/RequestHandlers/PendingChangesLogData.php index 5894ec3f72..bb0e55aac7 100644 --- a/app/Http/RequestHandlers/PendingChangesLogData.php +++ b/app/Http/RequestHandlers/PendingChangesLogData.php @@ -42,14 +42,11 @@ use function preg_replace_callback; */ class PendingChangesLogData implements RequestHandlerInterface { - /** @var DatatablesService */ - private $datatables_service; + private DatatablesService $datatables_service; - /** @var MyersDiff */ - private $myers_diff; + private MyersDiff $myers_diff; - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * @param DatatablesService $datatables_service diff --git a/app/Http/RequestHandlers/PendingChangesLogDelete.php b/app/Http/RequestHandlers/PendingChangesLogDelete.php index c630728dec..3f12d53051 100644 --- a/app/Http/RequestHandlers/PendingChangesLogDelete.php +++ b/app/Http/RequestHandlers/PendingChangesLogDelete.php @@ -33,8 +33,7 @@ use function response; */ class PendingChangesLogDelete implements RequestHandlerInterface { - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * @param PendingChangesService $pending_changes_service diff --git a/app/Http/RequestHandlers/PendingChangesLogDownload.php b/app/Http/RequestHandlers/PendingChangesLogDownload.php index 156c33c80e..974bc5dac4 100644 --- a/app/Http/RequestHandlers/PendingChangesLogDownload.php +++ b/app/Http/RequestHandlers/PendingChangesLogDownload.php @@ -35,8 +35,7 @@ use function response; */ class PendingChangesLogDownload implements RequestHandlerInterface { - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * @param PendingChangesService $pending_changes_service diff --git a/app/Http/RequestHandlers/PendingChangesLogPage.php b/app/Http/RequestHandlers/PendingChangesLogPage.php index 81e2662146..00a61c43f5 100644 --- a/app/Http/RequestHandlers/PendingChangesLogPage.php +++ b/app/Http/RequestHandlers/PendingChangesLogPage.php @@ -37,11 +37,9 @@ class PendingChangesLogPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/PendingChangesRejectChange.php b/app/Http/RequestHandlers/PendingChangesRejectChange.php index 67a297a2d7..1c594b9366 100644 --- a/app/Http/RequestHandlers/PendingChangesRejectChange.php +++ b/app/Http/RequestHandlers/PendingChangesRejectChange.php @@ -36,8 +36,7 @@ use function response; */ class PendingChangesRejectChange implements RequestHandlerInterface { - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * @param PendingChangesService $pending_changes_service diff --git a/app/Http/RequestHandlers/PendingChangesRejectRecord.php b/app/Http/RequestHandlers/PendingChangesRejectRecord.php index 4146d1d763..bbdfc93fb7 100644 --- a/app/Http/RequestHandlers/PendingChangesRejectRecord.php +++ b/app/Http/RequestHandlers/PendingChangesRejectRecord.php @@ -37,8 +37,7 @@ use function response; */ class PendingChangesRejectRecord implements RequestHandlerInterface { - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * @param PendingChangesService $pending_changes_service diff --git a/app/Http/RequestHandlers/PendingChangesRejectTree.php b/app/Http/RequestHandlers/PendingChangesRejectTree.php index 8f5948cd4d..e55b0d7cba 100644 --- a/app/Http/RequestHandlers/PendingChangesRejectTree.php +++ b/app/Http/RequestHandlers/PendingChangesRejectTree.php @@ -36,8 +36,7 @@ use function response; */ class PendingChangesRejectTree implements RequestHandlerInterface { - /** @var PendingChangesService */ - private $pending_changes_service; + private PendingChangesService $pending_changes_service; /** * @param PendingChangesService $pending_changes_service diff --git a/app/Http/RequestHandlers/Ping.php b/app/Http/RequestHandlers/Ping.php index e1134c81cf..a512e094c6 100644 --- a/app/Http/RequestHandlers/Ping.php +++ b/app/Http/RequestHandlers/Ping.php @@ -31,8 +31,7 @@ use function response; */ class Ping implements RequestHandlerInterface { - /** @var ServerCheckService */ - private $server_check_service; + private ServerCheckService $server_check_service; /** * @param ServerCheckService $server_check_service diff --git a/app/Http/RequestHandlers/RedirectAncestryPhp.php b/app/Http/RequestHandlers/RedirectAncestryPhp.php index df54633e25..1b8dd6cf1c 100644 --- a/app/Http/RequestHandlers/RedirectAncestryPhp.php +++ b/app/Http/RequestHandlers/RedirectAncestryPhp.php @@ -45,11 +45,9 @@ class RedirectAncestryPhp implements RequestHandlerInterface 3 => 'families', ]; - /** @var TreeService */ - private $tree_service; + private AncestorsChartModule $chart; - /** @var AncestorsChartModule */ - private $chart; + private TreeService $tree_service; /** * @param AncestorsChartModule $chart diff --git a/app/Http/RequestHandlers/RedirectBranchesPhp.php b/app/Http/RequestHandlers/RedirectBranchesPhp.php index 97419430ea..a7c46a8894 100644 --- a/app/Http/RequestHandlers/RedirectBranchesPhp.php +++ b/app/Http/RequestHandlers/RedirectBranchesPhp.php @@ -36,11 +36,9 @@ use function redirect; */ class RedirectBranchesPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private BranchesListModule $module; - /** @var BranchesListModule */ - private $module; + private TreeService $tree_service; /** * @param BranchesListModule $module diff --git a/app/Http/RequestHandlers/RedirectCalendarPhp.php b/app/Http/RequestHandlers/RedirectCalendarPhp.php index 15f0ed62c4..12d3fc2b09 100644 --- a/app/Http/RequestHandlers/RedirectCalendarPhp.php +++ b/app/Http/RequestHandlers/RedirectCalendarPhp.php @@ -35,8 +35,7 @@ use function redirect; */ class RedirectCalendarPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/RedirectCompactPhp.php b/app/Http/RequestHandlers/RedirectCompactPhp.php index b6859fa6f1..eacd3de57d 100644 --- a/app/Http/RequestHandlers/RedirectCompactPhp.php +++ b/app/Http/RequestHandlers/RedirectCompactPhp.php @@ -38,11 +38,9 @@ use function redirect; */ class RedirectCompactPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private CompactTreeChartModule $chart; - /** @var CompactTreeChartModule */ - private $chart; + private TreeService $tree_service; /** * @param CompactTreeChartModule $chart diff --git a/app/Http/RequestHandlers/RedirectDescendencyPhp.php b/app/Http/RequestHandlers/RedirectDescendencyPhp.php index 58aec360e2..d12c181774 100644 --- a/app/Http/RequestHandlers/RedirectDescendencyPhp.php +++ b/app/Http/RequestHandlers/RedirectDescendencyPhp.php @@ -45,11 +45,9 @@ class RedirectDescendencyPhp implements RequestHandlerInterface 3 => 'families', ]; - /** @var TreeService */ - private $tree_service; + private DescendancyChartModule $chart; - /** @var DescendancyChartModule */ - private $chart; + private TreeService $tree_service; /** * @param DescendancyChartModule $chart diff --git a/app/Http/RequestHandlers/RedirectFamListPhp.php b/app/Http/RequestHandlers/RedirectFamListPhp.php index 1ab997612b..d9e8aa3d96 100644 --- a/app/Http/RequestHandlers/RedirectFamListPhp.php +++ b/app/Http/RequestHandlers/RedirectFamListPhp.php @@ -40,11 +40,9 @@ use function redirect; */ class RedirectFamListPhp implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/RedirectFamilyBookPhp.php b/app/Http/RequestHandlers/RedirectFamilyBookPhp.php index 090e42d83c..9e7bb35daf 100644 --- a/app/Http/RequestHandlers/RedirectFamilyBookPhp.php +++ b/app/Http/RequestHandlers/RedirectFamilyBookPhp.php @@ -38,11 +38,9 @@ use function redirect; */ class RedirectFamilyBookPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private FamilyBookChartModule $chart; - /** @var FamilyBookChartModule */ - private $chart; + private TreeService $tree_service; /** * @param FamilyBookChartModule $chart diff --git a/app/Http/RequestHandlers/RedirectFamilyPhp.php b/app/Http/RequestHandlers/RedirectFamilyPhp.php index a69c459fb1..78de0c2aa5 100644 --- a/app/Http/RequestHandlers/RedirectFamilyPhp.php +++ b/app/Http/RequestHandlers/RedirectFamilyPhp.php @@ -37,8 +37,7 @@ use function redirect; */ class RedirectFamilyPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/RedirectFanChartPhp.php b/app/Http/RequestHandlers/RedirectFanChartPhp.php index ce3fb27f1b..f21767b0b3 100644 --- a/app/Http/RequestHandlers/RedirectFanChartPhp.php +++ b/app/Http/RequestHandlers/RedirectFanChartPhp.php @@ -38,11 +38,9 @@ use function redirect; */ class RedirectFanChartPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private FanChartModule $chart; - /** @var FanChartModule */ - private $chart; + private TreeService $tree_service; /** * @param FanChartModule $chart diff --git a/app/Http/RequestHandlers/RedirectGedRecordPhp.php b/app/Http/RequestHandlers/RedirectGedRecordPhp.php index 721afa3b5c..9babce5cb5 100644 --- a/app/Http/RequestHandlers/RedirectGedRecordPhp.php +++ b/app/Http/RequestHandlers/RedirectGedRecordPhp.php @@ -37,8 +37,7 @@ use function redirect; */ class RedirectGedRecordPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/RedirectHourGlassPhp.php b/app/Http/RequestHandlers/RedirectHourGlassPhp.php index 1a9d547871..e7c027e69d 100644 --- a/app/Http/RequestHandlers/RedirectHourGlassPhp.php +++ b/app/Http/RequestHandlers/RedirectHourGlassPhp.php @@ -38,19 +38,17 @@ use function redirect; */ class RedirectHourGlassPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private HourglassChartModule $chart; - /** @var HourglassChartModule */ - private $chart; + private TreeService $tree_service; /** - * @param HourglassChartModule $ancestors_chart + * @param HourglassChartModule $chart * @param TreeService $tree_service */ - public function __construct(HourglassChartModule $ancestors_chart, TreeService $tree_service) + public function __construct(HourglassChartModule $chart, TreeService $tree_service) { - $this->chart = $ancestors_chart; + $this->chart = $chart; $this->tree_service = $tree_service; } diff --git a/app/Http/RequestHandlers/RedirectIndiListPhp.php b/app/Http/RequestHandlers/RedirectIndiListPhp.php index f9d949071c..bc11dd315b 100644 --- a/app/Http/RequestHandlers/RedirectIndiListPhp.php +++ b/app/Http/RequestHandlers/RedirectIndiListPhp.php @@ -40,11 +40,9 @@ use function redirect; */ class RedirectIndiListPhp implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/RedirectIndividualPhp.php b/app/Http/RequestHandlers/RedirectIndividualPhp.php index a28390f5eb..c683043424 100644 --- a/app/Http/RequestHandlers/RedirectIndividualPhp.php +++ b/app/Http/RequestHandlers/RedirectIndividualPhp.php @@ -37,8 +37,7 @@ use function redirect; */ class RedirectIndividualPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/RedirectLifeSpanPhp.php b/app/Http/RequestHandlers/RedirectLifeSpanPhp.php index 495ae5ec7e..f93702fca6 100644 --- a/app/Http/RequestHandlers/RedirectLifeSpanPhp.php +++ b/app/Http/RequestHandlers/RedirectLifeSpanPhp.php @@ -37,11 +37,9 @@ use function redirect; */ class RedirectLifeSpanPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; - /** @var LifespansChartModule */ - private $chart; + private LifespansChartModule $chart; /** * @param LifespansChartModule $chart diff --git a/app/Http/RequestHandlers/RedirectMediaListPhp.php b/app/Http/RequestHandlers/RedirectMediaListPhp.php index 1f6ef2e131..650a30957f 100644 --- a/app/Http/RequestHandlers/RedirectMediaListPhp.php +++ b/app/Http/RequestHandlers/RedirectMediaListPhp.php @@ -40,11 +40,9 @@ use function redirect; */ class RedirectMediaListPhp implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/RedirectMediaViewerPhp.php b/app/Http/RequestHandlers/RedirectMediaViewerPhp.php index 735296fab5..8a08fd6840 100644 --- a/app/Http/RequestHandlers/RedirectMediaViewerPhp.php +++ b/app/Http/RequestHandlers/RedirectMediaViewerPhp.php @@ -37,8 +37,7 @@ use function redirect; */ class RedirectMediaViewerPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/RedirectModulePhp.php b/app/Http/RequestHandlers/RedirectModulePhp.php index a68fc08d52..d071e183d6 100644 --- a/app/Http/RequestHandlers/RedirectModulePhp.php +++ b/app/Http/RequestHandlers/RedirectModulePhp.php @@ -38,11 +38,9 @@ use function redirect; */ class RedirectModulePhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; - /** @var PedigreeMapModule */ - private $pedigree_map_module; + private PedigreeMapModule $pedigree_map_module; /** * @param PedigreeMapModule $pedigree_map_module diff --git a/app/Http/RequestHandlers/RedirectNoteListPhp.php b/app/Http/RequestHandlers/RedirectNoteListPhp.php index ff1744a552..e537538eb7 100644 --- a/app/Http/RequestHandlers/RedirectNoteListPhp.php +++ b/app/Http/RequestHandlers/RedirectNoteListPhp.php @@ -38,11 +38,9 @@ use function redirect; */ class RedirectNoteListPhp implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/RedirectNotePhp.php b/app/Http/RequestHandlers/RedirectNotePhp.php index 08ec804642..49af88720d 100644 --- a/app/Http/RequestHandlers/RedirectNotePhp.php +++ b/app/Http/RequestHandlers/RedirectNotePhp.php @@ -37,8 +37,7 @@ use function redirect; */ class RedirectNotePhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/RedirectPedigreePhp.php b/app/Http/RequestHandlers/RedirectPedigreePhp.php index 76f002c41d..31c8e4a7ac 100644 --- a/app/Http/RequestHandlers/RedirectPedigreePhp.php +++ b/app/Http/RequestHandlers/RedirectPedigreePhp.php @@ -45,11 +45,9 @@ class RedirectPedigreePhp implements RequestHandlerInterface 3 => 'bottom', ]; - /** @var TreeService */ - private $tree_service; + private PedigreeChartModule $chart; - /** @var PedigreeChartModule */ - private $chart; + private TreeService $tree_service; /** * @param PedigreeChartModule $chart diff --git a/app/Http/RequestHandlers/RedirectPlaceListPhp.php b/app/Http/RequestHandlers/RedirectPlaceListPhp.php index aff45408da..5b0e2a433a 100644 --- a/app/Http/RequestHandlers/RedirectPlaceListPhp.php +++ b/app/Http/RequestHandlers/RedirectPlaceListPhp.php @@ -40,11 +40,9 @@ use function redirect; */ class RedirectPlaceListPhp implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/RedirectRelationshipPhp.php b/app/Http/RequestHandlers/RedirectRelationshipPhp.php index 9d93d2e31d..e9bd44b8f5 100644 --- a/app/Http/RequestHandlers/RedirectRelationshipPhp.php +++ b/app/Http/RequestHandlers/RedirectRelationshipPhp.php @@ -38,20 +38,18 @@ use function redirect; */ class RedirectRelationshipPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; - /** @var RelationshipsChartModule */ - private $chart; + private RelationshipsChartModule $relationships_chart_module; /** - * @param RelationshipsChartModule $chart + * @param RelationshipsChartModule $relationships_chart_module * @param TreeService $tree_service */ - public function __construct(RelationshipsChartModule $chart, TreeService $tree_service) + public function __construct(RelationshipsChartModule $relationships_chart_module, TreeService $tree_service) { - $this->chart = $chart; - $this->tree_service = $tree_service; + $this->relationships_chart_module = $relationships_chart_module; + $this->tree_service = $tree_service; } /** @@ -73,7 +71,7 @@ class RedirectRelationshipPhp implements RequestHandlerInterface if ($tree instanceof Tree) { $individual = Registry::individualFactory()->make($pid1, $tree) ?? $tree->significantIndividual(Auth::user()); - $url = $this->chart->chartUrl($individual, [ + $url = $this->relationships_chart_module->chartUrl($individual, [ 'xref2' => $pid2, 'ancestors' => $ancestors, 'recursion' => $recursion, diff --git a/app/Http/RequestHandlers/RedirectRepoListPhp.php b/app/Http/RequestHandlers/RedirectRepoListPhp.php index 38362cef2f..914b89f012 100644 --- a/app/Http/RequestHandlers/RedirectRepoListPhp.php +++ b/app/Http/RequestHandlers/RedirectRepoListPhp.php @@ -38,11 +38,9 @@ use function redirect; */ class RedirectRepoListPhp implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/RedirectReportEnginePhp.php b/app/Http/RequestHandlers/RedirectReportEnginePhp.php index 4ff1453230..40edb83b0f 100644 --- a/app/Http/RequestHandlers/RedirectReportEnginePhp.php +++ b/app/Http/RequestHandlers/RedirectReportEnginePhp.php @@ -37,8 +37,7 @@ use function redirect; */ class RedirectReportEnginePhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/RedirectRepositoryPhp.php b/app/Http/RequestHandlers/RedirectRepositoryPhp.php index 6aff0c5480..d415eb6100 100644 --- a/app/Http/RequestHandlers/RedirectRepositoryPhp.php +++ b/app/Http/RequestHandlers/RedirectRepositoryPhp.php @@ -37,8 +37,7 @@ use function redirect; */ class RedirectRepositoryPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/RedirectSourceListPhp.php b/app/Http/RequestHandlers/RedirectSourceListPhp.php index 0cfe215baf..5aff4d96ce 100644 --- a/app/Http/RequestHandlers/RedirectSourceListPhp.php +++ b/app/Http/RequestHandlers/RedirectSourceListPhp.php @@ -38,11 +38,9 @@ use function redirect; */ class RedirectSourceListPhp implements RequestHandlerInterface { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/RedirectSourcePhp.php b/app/Http/RequestHandlers/RedirectSourcePhp.php index 7bf2c981ec..49313abe6d 100644 --- a/app/Http/RequestHandlers/RedirectSourcePhp.php +++ b/app/Http/RequestHandlers/RedirectSourcePhp.php @@ -37,8 +37,7 @@ use function redirect; */ class RedirectSourcePhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/RedirectStatisticsPhp.php b/app/Http/RequestHandlers/RedirectStatisticsPhp.php index 643fcedce0..3f678bb510 100644 --- a/app/Http/RequestHandlers/RedirectStatisticsPhp.php +++ b/app/Http/RequestHandlers/RedirectStatisticsPhp.php @@ -37,20 +37,18 @@ use function redirect; */ class RedirectStatisticsPhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; - /** @var StatisticsChartModule */ - private $chart; + private StatisticsChartModule $statistics_chart_module; /** - * @param StatisticsChartModule $chart + * @param StatisticsChartModule $statistics_chart_module * @param TreeService $tree_service */ - public function __construct(StatisticsChartModule $chart, TreeService $tree_service) + public function __construct(StatisticsChartModule $statistics_chart_module, TreeService $tree_service) { - $this->chart = $chart; - $this->tree_service = $tree_service; + $this->statistics_chart_module = $statistics_chart_module; + $this->tree_service = $tree_service; } /** @@ -69,7 +67,7 @@ class RedirectStatisticsPhp implements RequestHandlerInterface $individual = $tree->significantIndividual(Auth::user()); // This chart stored a list of individuals in the session, which we won't have. - $url = $this->chart->chartUrl($individual, []); + $url = $this->statistics_chart_module->chartUrl($individual, []); return redirect($url, StatusCodeInterface::STATUS_MOVED_PERMANENTLY); } diff --git a/app/Http/RequestHandlers/RedirectTimeLinePhp.php b/app/Http/RequestHandlers/RedirectTimeLinePhp.php index 528fb61f7d..6cc0fbe184 100644 --- a/app/Http/RequestHandlers/RedirectTimeLinePhp.php +++ b/app/Http/RequestHandlers/RedirectTimeLinePhp.php @@ -38,20 +38,18 @@ use function redirect; */ class RedirectTimeLinePhp implements RequestHandlerInterface { - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; - /** @var TimelineChartModule */ - private $chart; + private TimelineChartModule $timeline_chart_module; /** - * @param TimelineChartModule $chart + * @param TimelineChartModule $timeline_chart_module * @param TreeService $tree_service */ - public function __construct(TimelineChartModule $chart, TreeService $tree_service) + public function __construct(TimelineChartModule $timeline_chart_module, TreeService $tree_service) { - $this->chart = $chart; - $this->tree_service = $tree_service; + $this->timeline_chart_module = $timeline_chart_module; + $this->tree_service = $tree_service; } /** @@ -70,7 +68,7 @@ class RedirectTimeLinePhp implements RequestHandlerInterface if ($tree instanceof Tree) { $individual = Registry::individualFactory()->make($pids[0] ?? '', $tree) ?? $tree->significantIndividual(Auth::user()); - $url = $this->chart->chartUrl($individual, [ + $url = $this->timeline_chart_module->chartUrl($individual, [ 'xrefs' => $pids, ]); diff --git a/app/Http/RequestHandlers/RegisterAction.php b/app/Http/RequestHandlers/RegisterAction.php index c35d1fdf90..0dba323e33 100644 --- a/app/Http/RequestHandlers/RegisterAction.php +++ b/app/Http/RequestHandlers/RegisterAction.php @@ -49,14 +49,11 @@ class RegisterAction implements RequestHandlerInterface { use ViewResponseTrait; - /** @var CaptchaService */ - private $captcha_service; + private CaptchaService $captcha_service; - /** @var EmailService */ - private $email_service; + private EmailService $email_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * RegisterController constructor. diff --git a/app/Http/RequestHandlers/RegisterPage.php b/app/Http/RequestHandlers/RegisterPage.php index f44004d97d..6e3ec0c5cf 100644 --- a/app/Http/RequestHandlers/RegisterPage.php +++ b/app/Http/RequestHandlers/RegisterPage.php @@ -35,8 +35,7 @@ class RegisterPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var CaptchaService */ - private $captcha_service; + private CaptchaService $captcha_service; /** * RegisterPage constructor. diff --git a/app/Http/RequestHandlers/RenumberTreeAction.php b/app/Http/RequestHandlers/RenumberTreeAction.php index 949ba12726..24c31e094f 100644 --- a/app/Http/RequestHandlers/RenumberTreeAction.php +++ b/app/Http/RequestHandlers/RenumberTreeAction.php @@ -48,11 +48,9 @@ use function route; */ class RenumberTreeAction implements RequestHandlerInterface { - /** @var AdminService */ - private $admin_service; + private AdminService $admin_service; - /** @var TimeoutService */ - private $timeout_service; + private TimeoutService $timeout_service; /** * @param AdminService $admin_service diff --git a/app/Http/RequestHandlers/RenumberTreePage.php b/app/Http/RequestHandlers/RenumberTreePage.php index fcbc558c90..51929a33d8 100644 --- a/app/Http/RequestHandlers/RenumberTreePage.php +++ b/app/Http/RequestHandlers/RenumberTreePage.php @@ -37,8 +37,7 @@ class RenumberTreePage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var AdminService */ - private $admin_service; + private AdminService $admin_service; /** * @param AdminService $admin_service diff --git a/app/Http/RequestHandlers/ReportSetupPage.php b/app/Http/RequestHandlers/ReportSetupPage.php index 4aa55ea4d4..0890abc838 100644 --- a/app/Http/RequestHandlers/ReportSetupPage.php +++ b/app/Http/RequestHandlers/ReportSetupPage.php @@ -45,11 +45,9 @@ class ReportSetupPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var LocalizationService */ - private $localization_service; + private LocalizationService $localization_service; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * ReportEngineController constructor. diff --git a/app/Http/RequestHandlers/RepositoryPage.php b/app/Http/RequestHandlers/RepositoryPage.php index 79d8794649..265e7614f3 100644 --- a/app/Http/RequestHandlers/RepositoryPage.php +++ b/app/Http/RequestHandlers/RepositoryPage.php @@ -59,8 +59,7 @@ class RepositoryPage implements RequestHandlerInterface 'REPO:RESN', ]; - /** @var ClipboardService */ - private $clipboard_service; + private ClipboardService $clipboard_service; /** * RepositoryPage constructor. diff --git a/app/Http/RequestHandlers/RobotsTxt.php b/app/Http/RequestHandlers/RobotsTxt.php index 684e3ac409..71f01eed4c 100644 --- a/app/Http/RequestHandlers/RobotsTxt.php +++ b/app/Http/RequestHandlers/RobotsTxt.php @@ -45,8 +45,7 @@ class RobotsTxt implements RequestHandlerInterface 'account', ]; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * @param ModuleService $module_service diff --git a/app/Http/RequestHandlers/SearchAdvancedPage.php b/app/Http/RequestHandlers/SearchAdvancedPage.php index 7b41d4b940..d95a7a4ea2 100644 --- a/app/Http/RequestHandlers/SearchAdvancedPage.php +++ b/app/Http/RequestHandlers/SearchAdvancedPage.php @@ -123,8 +123,7 @@ class SearchAdvancedPage implements RequestHandlerInterface 'TITL', ]; - /** @var SearchService */ - private $search_service; + private SearchService $search_service; /** * SearchController constructor. diff --git a/app/Http/RequestHandlers/SearchGeneralPage.php b/app/Http/RequestHandlers/SearchGeneralPage.php index ade6416d69..2ab5f488af 100644 --- a/app/Http/RequestHandlers/SearchGeneralPage.php +++ b/app/Http/RequestHandlers/SearchGeneralPage.php @@ -45,11 +45,9 @@ class SearchGeneralPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var SearchService */ - private $search_service; + private SearchService $search_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * SearchController constructor. diff --git a/app/Http/RequestHandlers/SearchPhoneticPage.php b/app/Http/RequestHandlers/SearchPhoneticPage.php index 0ab5bd66fd..9f34382507 100644 --- a/app/Http/RequestHandlers/SearchPhoneticPage.php +++ b/app/Http/RequestHandlers/SearchPhoneticPage.php @@ -39,11 +39,9 @@ class SearchPhoneticPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var SearchService */ - private $search_service; + private SearchService $search_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * SearchController constructor. diff --git a/app/Http/RequestHandlers/SearchReplaceAction.php b/app/Http/RequestHandlers/SearchReplaceAction.php index a520aaf5ed..af621dbfb4 100644 --- a/app/Http/RequestHandlers/SearchReplaceAction.php +++ b/app/Http/RequestHandlers/SearchReplaceAction.php @@ -38,8 +38,7 @@ class SearchReplaceAction implements RequestHandlerInterface { use ViewResponseTrait; - /** @var SearchService */ - private $search_service; + private SearchService $search_service; /** * SearchController constructor. diff --git a/app/Http/RequestHandlers/Select2Family.php b/app/Http/RequestHandlers/Select2Family.php index 45c37ad01c..4fb1fe0a95 100644 --- a/app/Http/RequestHandlers/Select2Family.php +++ b/app/Http/RequestHandlers/Select2Family.php @@ -33,8 +33,7 @@ use function view; */ class Select2Family extends AbstractSelect2Handler { - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * Select2Family constructor. diff --git a/app/Http/RequestHandlers/Select2Individual.php b/app/Http/RequestHandlers/Select2Individual.php index 372f9435de..a3d700027d 100644 --- a/app/Http/RequestHandlers/Select2Individual.php +++ b/app/Http/RequestHandlers/Select2Individual.php @@ -33,8 +33,7 @@ use function view; */ class Select2Individual extends AbstractSelect2Handler { - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * Select2Individual constructor. diff --git a/app/Http/RequestHandlers/Select2Location.php b/app/Http/RequestHandlers/Select2Location.php index ad2bfd1242..9fbd9140e1 100644 --- a/app/Http/RequestHandlers/Select2Location.php +++ b/app/Http/RequestHandlers/Select2Location.php @@ -32,8 +32,7 @@ use function view; */ class Select2Location extends AbstractSelect2Handler { - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * Select2Location constructor. diff --git a/app/Http/RequestHandlers/Select2MediaObject.php b/app/Http/RequestHandlers/Select2MediaObject.php index fd7285c636..4672295af7 100644 --- a/app/Http/RequestHandlers/Select2MediaObject.php +++ b/app/Http/RequestHandlers/Select2MediaObject.php @@ -32,8 +32,7 @@ use function view; */ class Select2MediaObject extends AbstractSelect2Handler { - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * Select2MediaObject constructor. diff --git a/app/Http/RequestHandlers/Select2Note.php b/app/Http/RequestHandlers/Select2Note.php index 7ba4583ada..8c5d4c19af 100644 --- a/app/Http/RequestHandlers/Select2Note.php +++ b/app/Http/RequestHandlers/Select2Note.php @@ -32,8 +32,7 @@ use function view; */ class Select2Note extends AbstractSelect2Handler { - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * Select2Note constructor. diff --git a/app/Http/RequestHandlers/Select2Place.php b/app/Http/RequestHandlers/Select2Place.php index 265766b9cf..7d4a754e12 100644 --- a/app/Http/RequestHandlers/Select2Place.php +++ b/app/Http/RequestHandlers/Select2Place.php @@ -29,8 +29,7 @@ use Illuminate\Support\Collection; */ class Select2Place extends AbstractSelect2Handler { - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * @param SearchService $search_service diff --git a/app/Http/RequestHandlers/Select2Repository.php b/app/Http/RequestHandlers/Select2Repository.php index 8f3d687bbf..b0976579a3 100644 --- a/app/Http/RequestHandlers/Select2Repository.php +++ b/app/Http/RequestHandlers/Select2Repository.php @@ -32,8 +32,7 @@ use function view; */ class Select2Repository extends AbstractSelect2Handler { - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * Select2Repository constructor. diff --git a/app/Http/RequestHandlers/Select2Source.php b/app/Http/RequestHandlers/Select2Source.php index 385b309f27..5072b80b13 100644 --- a/app/Http/RequestHandlers/Select2Source.php +++ b/app/Http/RequestHandlers/Select2Source.php @@ -32,8 +32,7 @@ use function view; */ class Select2Source extends AbstractSelect2Handler { - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * Select2Source constructor. diff --git a/app/Http/RequestHandlers/Select2Submission.php b/app/Http/RequestHandlers/Select2Submission.php index 94c8a85a41..50722ca685 100644 --- a/app/Http/RequestHandlers/Select2Submission.php +++ b/app/Http/RequestHandlers/Select2Submission.php @@ -32,8 +32,7 @@ use function view; */ class Select2Submission extends AbstractSelect2Handler { - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * Select2Submission constructor. diff --git a/app/Http/RequestHandlers/Select2Submitter.php b/app/Http/RequestHandlers/Select2Submitter.php index 2f28c09cd5..c43b5cd65e 100644 --- a/app/Http/RequestHandlers/Select2Submitter.php +++ b/app/Http/RequestHandlers/Select2Submitter.php @@ -32,8 +32,7 @@ use function view; */ class Select2Submitter extends AbstractSelect2Handler { - /** @var SearchService */ - protected $search_service; + protected SearchService $search_service; /** * Select2Submitter constructor. diff --git a/app/Http/RequestHandlers/SetupWizard.php b/app/Http/RequestHandlers/SetupWizard.php index 8319c8a8b6..25136cebac 100644 --- a/app/Http/RequestHandlers/SetupWizard.php +++ b/app/Http/RequestHandlers/SetupWizard.php @@ -87,17 +87,13 @@ class SetupWizard implements RequestHandlerInterface 'sqlsvr' => '1433', ]; - /** @var MigrationService */ - private $migration_service; + private MigrationService $migration_service; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var ServerCheckService */ - private $server_check_service; + private ServerCheckService $server_check_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * SetupWizard constructor. diff --git a/app/Http/RequestHandlers/SiteLogsData.php b/app/Http/RequestHandlers/SiteLogsData.php index 39ffa0502c..a5278a051b 100644 --- a/app/Http/RequestHandlers/SiteLogsData.php +++ b/app/Http/RequestHandlers/SiteLogsData.php @@ -34,11 +34,9 @@ use function e; */ class SiteLogsData implements RequestHandlerInterface { - /** @var DatatablesService */ - private $datatables_service; + private DatatablesService $datatables_service; - /** @var SiteLogsService */ - private $site_logs_service; + private SiteLogsService $site_logs_service; /** * @param DatatablesService $datatables_service diff --git a/app/Http/RequestHandlers/SiteLogsDelete.php b/app/Http/RequestHandlers/SiteLogsDelete.php index 958efa984e..ec93fb9ed7 100644 --- a/app/Http/RequestHandlers/SiteLogsDelete.php +++ b/app/Http/RequestHandlers/SiteLogsDelete.php @@ -31,8 +31,7 @@ use function response; */ class SiteLogsDelete implements RequestHandlerInterface { - /** @var SiteLogsService */ - private $site_logs_service; + private SiteLogsService $site_logs_service; /** * @param SiteLogsService $site_logs_service diff --git a/app/Http/RequestHandlers/SiteLogsDownload.php b/app/Http/RequestHandlers/SiteLogsDownload.php index 037f2a3eba..4b57c88637 100644 --- a/app/Http/RequestHandlers/SiteLogsDownload.php +++ b/app/Http/RequestHandlers/SiteLogsDownload.php @@ -34,8 +34,7 @@ use function str_replace; */ class SiteLogsDownload implements RequestHandlerInterface { - /** @var SiteLogsService */ - private $site_logs_service; + private SiteLogsService $site_logs_service; /** * @param SiteLogsService $site_logs_service diff --git a/app/Http/RequestHandlers/SiteLogsPage.php b/app/Http/RequestHandlers/SiteLogsPage.php index 4f5bbe77ff..4f9120242d 100644 --- a/app/Http/RequestHandlers/SiteLogsPage.php +++ b/app/Http/RequestHandlers/SiteLogsPage.php @@ -42,11 +42,9 @@ class SiteLogsPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * @param TreeService $tree_service diff --git a/app/Http/RequestHandlers/SitePreferencesPage.php b/app/Http/RequestHandlers/SitePreferencesPage.php index 4df75038f9..4faf6c6eb9 100644 --- a/app/Http/RequestHandlers/SitePreferencesPage.php +++ b/app/Http/RequestHandlers/SitePreferencesPage.php @@ -34,8 +34,7 @@ class SitePreferencesPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * AdminSiteController constructor. diff --git a/app/Http/RequestHandlers/SourcePage.php b/app/Http/RequestHandlers/SourcePage.php index 0631e584f7..e72568c8e0 100644 --- a/app/Http/RequestHandlers/SourcePage.php +++ b/app/Http/RequestHandlers/SourcePage.php @@ -64,8 +64,7 @@ class SourcePage implements RequestHandlerInterface 'SOUR:RESN', ]; - /** @var ClipboardService */ - private $clipboard_service; + private ClipboardService $clipboard_service; /** * SourcePage constructor. diff --git a/app/Http/RequestHandlers/SynchronizeTrees.php b/app/Http/RequestHandlers/SynchronizeTrees.php index 55d97426c9..8edbd7483f 100644 --- a/app/Http/RequestHandlers/SynchronizeTrees.php +++ b/app/Http/RequestHandlers/SynchronizeTrees.php @@ -43,14 +43,11 @@ use function route; */ class SynchronizeTrees implements RequestHandlerInterface { - /** @var AdminService */ - private $admin_service; + private AdminService $admin_service; - /** @var TimeoutService */ - private $timeout_service; + private TimeoutService $timeout_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * AdminTreesController constructor. diff --git a/app/Http/RequestHandlers/TreePage.php b/app/Http/RequestHandlers/TreePage.php index e9414d6f91..ebcb5b81a2 100644 --- a/app/Http/RequestHandlers/TreePage.php +++ b/app/Http/RequestHandlers/TreePage.php @@ -41,8 +41,7 @@ class TreePage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/TreePageBlock.php b/app/Http/RequestHandlers/TreePageBlock.php index 9b17a012d7..cf12db600a 100644 --- a/app/Http/RequestHandlers/TreePageBlock.php +++ b/app/Http/RequestHandlers/TreePageBlock.php @@ -36,8 +36,7 @@ use function view; */ class TreePageBlock implements RequestHandlerInterface { - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/TreePageBlockEdit.php b/app/Http/RequestHandlers/TreePageBlockEdit.php index ad61174862..79cf8086eb 100644 --- a/app/Http/RequestHandlers/TreePageBlockEdit.php +++ b/app/Http/RequestHandlers/TreePageBlockEdit.php @@ -37,8 +37,7 @@ class TreePageBlockEdit implements RequestHandlerInterface { use ViewResponseTrait; - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/TreePageBlockUpdate.php b/app/Http/RequestHandlers/TreePageBlockUpdate.php index b60e6c7058..5973f8fda6 100644 --- a/app/Http/RequestHandlers/TreePageBlockUpdate.php +++ b/app/Http/RequestHandlers/TreePageBlockUpdate.php @@ -34,8 +34,7 @@ use function route; */ class TreePageBlockUpdate implements RequestHandlerInterface { - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/TreePageDefaultEdit.php b/app/Http/RequestHandlers/TreePageDefaultEdit.php index a572b410ae..d0784a6dbc 100644 --- a/app/Http/RequestHandlers/TreePageDefaultEdit.php +++ b/app/Http/RequestHandlers/TreePageDefaultEdit.php @@ -38,8 +38,7 @@ class TreePageDefaultEdit implements RequestHandlerInterface { use ViewResponseTrait; - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/TreePageDefaultUpdate.php b/app/Http/RequestHandlers/TreePageDefaultUpdate.php index d85117f2c1..089e55ccf7 100644 --- a/app/Http/RequestHandlers/TreePageDefaultUpdate.php +++ b/app/Http/RequestHandlers/TreePageDefaultUpdate.php @@ -34,8 +34,7 @@ use function route; */ class TreePageDefaultUpdate implements RequestHandlerInterface { - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/TreePageEdit.php b/app/Http/RequestHandlers/TreePageEdit.php index c98320c2bd..5bfd2ef106 100644 --- a/app/Http/RequestHandlers/TreePageEdit.php +++ b/app/Http/RequestHandlers/TreePageEdit.php @@ -39,8 +39,7 @@ class TreePageEdit implements RequestHandlerInterface { use ViewResponseTrait; - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/TreePageUpdate.php b/app/Http/RequestHandlers/TreePageUpdate.php index dc98b1ce38..1717c9ec3a 100644 --- a/app/Http/RequestHandlers/TreePageUpdate.php +++ b/app/Http/RequestHandlers/TreePageUpdate.php @@ -37,8 +37,7 @@ use function route; */ class TreePageUpdate implements RequestHandlerInterface { - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/TreePreferencesPage.php b/app/Http/RequestHandlers/TreePreferencesPage.php index 535c31180a..d3f875a1d0 100644 --- a/app/Http/RequestHandlers/TreePreferencesPage.php +++ b/app/Http/RequestHandlers/TreePreferencesPage.php @@ -81,14 +81,11 @@ class TreePreferencesPage implements RequestHandlerInterface 'CHAN', 'NOTE', 'OBJE', 'RESN', ]; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; public function __construct( ModuleService $module_service, diff --git a/app/Http/RequestHandlers/TreePrivacyPage.php b/app/Http/RequestHandlers/TreePrivacyPage.php index 5790fe1aa8..766d7f70d7 100644 --- a/app/Http/RequestHandlers/TreePrivacyPage.php +++ b/app/Http/RequestHandlers/TreePrivacyPage.php @@ -45,8 +45,7 @@ class TreePrivacyPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; public function __construct(TreeService $tree_service) { diff --git a/app/Http/RequestHandlers/UnconnectedAction.php b/app/Http/RequestHandlers/UnconnectedAction.php index cca02d55d2..762e9c574c 100644 --- a/app/Http/RequestHandlers/UnconnectedAction.php +++ b/app/Http/RequestHandlers/UnconnectedAction.php @@ -31,8 +31,7 @@ use function assert; */ class UnconnectedAction implements RequestHandlerInterface { - /** @var string */ - protected $layout = 'layouts/administration'; + protected string $layout = 'layouts/administration'; /** * @param ServerRequestInterface $request diff --git a/app/Http/RequestHandlers/UpgradeWizardPage.php b/app/Http/RequestHandlers/UpgradeWizardPage.php index 906a43b3d2..1fd87dfc9a 100644 --- a/app/Http/RequestHandlers/UpgradeWizardPage.php +++ b/app/Http/RequestHandlers/UpgradeWizardPage.php @@ -49,11 +49,9 @@ class UpgradeWizardPage implements RequestHandlerInterface private const STEP_UNZIP = 'Unzip'; private const STEP_COPY = 'Copy'; - /** @var UpgradeService */ - private $upgrade_service; + private TreeService $tree_service; - /** @var TreeService */ - private $tree_service; + private UpgradeService $upgrade_service; /** * UpgradeController constructor. diff --git a/app/Http/RequestHandlers/UpgradeWizardStep.php b/app/Http/RequestHandlers/UpgradeWizardStep.php index d8c672e8d6..af12768c29 100644 --- a/app/Http/RequestHandlers/UpgradeWizardStep.php +++ b/app/Http/RequestHandlers/UpgradeWizardStep.php @@ -82,14 +82,11 @@ class UpgradeWizardStep implements RequestHandlerInterface 'vendor', ]; - /** @var GedcomExportService */ - private $gedcom_export_service; + private GedcomExportService $gedcom_export_service; - /** @var UpgradeService */ - private $upgrade_service; + private UpgradeService $upgrade_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * UpgradeController constructor. diff --git a/app/Http/RequestHandlers/UploadMediaAction.php b/app/Http/RequestHandlers/UploadMediaAction.php index cb7590979e..7f7ce7b340 100644 --- a/app/Http/RequestHandlers/UploadMediaAction.php +++ b/app/Http/RequestHandlers/UploadMediaAction.php @@ -50,8 +50,7 @@ use const UPLOAD_ERR_OK; */ class UploadMediaAction implements RequestHandlerInterface { - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; /** * MediaController constructor. diff --git a/app/Http/RequestHandlers/UploadMediaPage.php b/app/Http/RequestHandlers/UploadMediaPage.php index 151820df9a..898db9043e 100644 --- a/app/Http/RequestHandlers/UploadMediaPage.php +++ b/app/Http/RequestHandlers/UploadMediaPage.php @@ -39,8 +39,7 @@ class UploadMediaPage implements RequestHandlerInterface // How many files to upload on one form. private const MAX_UPLOAD_FILES = 10; - /** @var MediaFileService */ - private $media_file_service; + private MediaFileService $media_file_service; /** * MediaController constructor. diff --git a/app/Http/RequestHandlers/UserAddAction.php b/app/Http/RequestHandlers/UserAddAction.php index d276edfec8..2165e3cdba 100644 --- a/app/Http/RequestHandlers/UserAddAction.php +++ b/app/Http/RequestHandlers/UserAddAction.php @@ -36,8 +36,7 @@ use function route; */ class UserAddAction implements RequestHandlerInterface { - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * UserAddAction constructor. diff --git a/app/Http/RequestHandlers/UserEditAction.php b/app/Http/RequestHandlers/UserEditAction.php index c0390957c4..9d44b044b9 100644 --- a/app/Http/RequestHandlers/UserEditAction.php +++ b/app/Http/RequestHandlers/UserEditAction.php @@ -40,14 +40,11 @@ use function route; */ class UserEditAction implements RequestHandlerInterface { - /** @var EmailService */ - private $email_service; + private EmailService $email_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * UserEditAction constructor. diff --git a/app/Http/RequestHandlers/UserEditPage.php b/app/Http/RequestHandlers/UserEditPage.php index 9c667aebdf..f245afd28a 100644 --- a/app/Http/RequestHandlers/UserEditPage.php +++ b/app/Http/RequestHandlers/UserEditPage.php @@ -40,17 +40,13 @@ class UserEditPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var MessageService */ - private $message_service; + private MessageService $message_service; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * UserEditPage constructor. diff --git a/app/Http/RequestHandlers/UserListData.php b/app/Http/RequestHandlers/UserListData.php index 7ac5e8ce1e..c5c9be3248 100644 --- a/app/Http/RequestHandlers/UserListData.php +++ b/app/Http/RequestHandlers/UserListData.php @@ -40,14 +40,11 @@ use function e; */ class UserListData implements RequestHandlerInterface { - /** @var DatatablesService */ - private $datatables_service; + private DatatablesService $datatables_service; - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * UserListData constructor. diff --git a/app/Http/RequestHandlers/UserPage.php b/app/Http/RequestHandlers/UserPage.php index 933843623f..45ba45323d 100644 --- a/app/Http/RequestHandlers/UserPage.php +++ b/app/Http/RequestHandlers/UserPage.php @@ -41,8 +41,7 @@ class UserPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/UserPageBlock.php b/app/Http/RequestHandlers/UserPageBlock.php index d13ea233cd..5ee708e1cb 100644 --- a/app/Http/RequestHandlers/UserPageBlock.php +++ b/app/Http/RequestHandlers/UserPageBlock.php @@ -37,8 +37,7 @@ use function view; */ class UserPageBlock implements RequestHandlerInterface { - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/UserPageBlockEdit.php b/app/Http/RequestHandlers/UserPageBlockEdit.php index 354403afd6..4cb6712e54 100644 --- a/app/Http/RequestHandlers/UserPageBlockEdit.php +++ b/app/Http/RequestHandlers/UserPageBlockEdit.php @@ -37,8 +37,7 @@ class UserPageBlockEdit implements RequestHandlerInterface { use ViewResponseTrait; - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/UserPageBlockUpdate.php b/app/Http/RequestHandlers/UserPageBlockUpdate.php index f72efe2e5e..8c42280a08 100644 --- a/app/Http/RequestHandlers/UserPageBlockUpdate.php +++ b/app/Http/RequestHandlers/UserPageBlockUpdate.php @@ -34,8 +34,7 @@ use function route; */ class UserPageBlockUpdate implements RequestHandlerInterface { - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/UserPageDefaultEdit.php b/app/Http/RequestHandlers/UserPageDefaultEdit.php index 1c4da5499a..35673c0c0d 100644 --- a/app/Http/RequestHandlers/UserPageDefaultEdit.php +++ b/app/Http/RequestHandlers/UserPageDefaultEdit.php @@ -38,8 +38,7 @@ class UserPageDefaultEdit implements RequestHandlerInterface { use ViewResponseTrait; - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/UserPageDefaultUpdate.php b/app/Http/RequestHandlers/UserPageDefaultUpdate.php index 4342207e77..90e7d99b83 100644 --- a/app/Http/RequestHandlers/UserPageDefaultUpdate.php +++ b/app/Http/RequestHandlers/UserPageDefaultUpdate.php @@ -34,8 +34,7 @@ use function route; */ class UserPageDefaultUpdate implements RequestHandlerInterface { - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/UserPageEdit.php b/app/Http/RequestHandlers/UserPageEdit.php index e5b1523c4c..f7378c16ae 100644 --- a/app/Http/RequestHandlers/UserPageEdit.php +++ b/app/Http/RequestHandlers/UserPageEdit.php @@ -39,8 +39,7 @@ class UserPageEdit implements RequestHandlerInterface { use ViewResponseTrait; - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/UserPageUpdate.php b/app/Http/RequestHandlers/UserPageUpdate.php index 570e5f39fe..73b30a2ab7 100644 --- a/app/Http/RequestHandlers/UserPageUpdate.php +++ b/app/Http/RequestHandlers/UserPageUpdate.php @@ -37,8 +37,7 @@ use function route; */ class UserPageUpdate implements RequestHandlerInterface { - /** @var HomePageService */ - private $home_page_service; + private HomePageService $home_page_service; /** * @param HomePageService $home_page_service diff --git a/app/Http/RequestHandlers/UsersCleanupPage.php b/app/Http/RequestHandlers/UsersCleanupPage.php index f043d94cd0..04917a5232 100644 --- a/app/Http/RequestHandlers/UsersCleanupPage.php +++ b/app/Http/RequestHandlers/UsersCleanupPage.php @@ -34,8 +34,7 @@ class UsersCleanupPage implements RequestHandlerInterface { use ViewResponseTrait; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * @param UserService $user_service diff --git a/app/Http/RequestHandlers/VerifyEmail.php b/app/Http/RequestHandlers/VerifyEmail.php index 4ef0d45baf..f0a9900078 100644 --- a/app/Http/RequestHandlers/VerifyEmail.php +++ b/app/Http/RequestHandlers/VerifyEmail.php @@ -40,11 +40,9 @@ class VerifyEmail implements RequestHandlerInterface { use ViewResponseTrait; - /** @var EmailService */ - private $email_service; + private EmailService $email_service; - /** @var UserService */ - private $user_service; + private UserService $user_service; /** * MessageController constructor. diff --git a/app/Http/ViewResponseTrait.php b/app/Http/ViewResponseTrait.php index d35643bd09..b6497090c4 100644 --- a/app/Http/ViewResponseTrait.php +++ b/app/Http/ViewResponseTrait.php @@ -32,8 +32,7 @@ use function view; */ trait ViewResponseTrait { - /** @var string */ - protected $layout = 'layouts/default'; + protected string $layout = 'layouts/default'; /** * @param string $view_name diff --git a/app/Module/FixDuplicateLinks.php b/app/Module/FixDuplicateLinks.php index 68ad50dd5a..1c5ea0a6c1 100644 --- a/app/Module/FixDuplicateLinks.php +++ b/app/Module/FixDuplicateLinks.php @@ -35,8 +35,7 @@ class FixDuplicateLinks extends AbstractModule implements ModuleDataFixInterface { use ModuleDataFixTrait; - /** @var DataFixService */ - private $data_fix_service; + private DataFixService $data_fix_service; /** * FixMissingDeaths constructor. diff --git a/app/Module/FixNameTags.php b/app/Module/FixNameTags.php index 844aeeef57..5b5ab5f2d7 100644 --- a/app/Module/FixNameTags.php +++ b/app/Module/FixNameTags.php @@ -60,8 +60,7 @@ class FixNameTags extends AbstractModule implements ModuleDataFixInterface '_SLDN' => 'aka', // Soldier name ]; - /** @var DataFixService */ - private $data_fix_service; + private DataFixService $data_fix_service; /** * FixMissingDeaths constructor. diff --git a/app/Module/FixPlaceNames.php b/app/Module/FixPlaceNames.php index fdc3aa4525..1898974e11 100644 --- a/app/Module/FixPlaceNames.php +++ b/app/Module/FixPlaceNames.php @@ -38,8 +38,7 @@ class FixPlaceNames extends AbstractModule implements ModuleDataFixInterface { use ModuleDataFixTrait; - /** @var DataFixService */ - private $data_fix_service; + private DataFixService $data_fix_service; /** * FixMissingDeaths constructor. diff --git a/app/Module/IndividualListModule.php b/app/Module/IndividualListModule.php index f6bb08a3ec..557b023dcf 100644 --- a/app/Module/IndividualListModule.php +++ b/app/Module/IndividualListModule.php @@ -62,8 +62,7 @@ class IndividualListModule extends AbstractModule implements ModuleListInterface protected const ROUTE_URL = '/tree/{tree}/individual-list'; - /** @var LocalizationService */ - private $localization_service; + private LocalizationService $localization_service; /** * IndividualListModule constructor. diff --git a/app/Services/HomePageService.php b/app/Services/HomePageService.php index 97c8d5987f..99e15c28ca 100644 --- a/app/Services/HomePageService.php +++ b/app/Services/HomePageService.php @@ -39,8 +39,7 @@ use function is_numeric; */ class HomePageService { - /** @var ModuleService */ - private $module_service; + private ModuleService $module_service; /** * HomePageController constructor. diff --git a/app/Services/MessageService.php b/app/Services/MessageService.php index 7ea8fef105..fab15f1ed6 100644 --- a/app/Services/MessageService.php +++ b/app/Services/MessageService.php @@ -38,11 +38,9 @@ use function view; */ class MessageService { - /** @var UserService */ - private $user_service; + private EmailService $email_service; - /** @var EmailService */ - private $email_service; + private UserService $user_service; /** * MessageService constructor. diff --git a/app/Services/SearchService.php b/app/Services/SearchService.php index 88d913c239..7b366dbd91 100644 --- a/app/Services/SearchService.php +++ b/app/Services/SearchService.php @@ -66,8 +66,7 @@ class SearchService // Do not attempt to show search results larger than this/ protected const MAX_SEARCH_RESULTS = 5000; - /** @var TreeService */ - private $tree_service; + private TreeService $tree_service; /** * SearchService constructor. diff --git a/app/Services/TimeoutService.php b/app/Services/TimeoutService.php index d59cce78fa..eb0598478a 100644 --- a/app/Services/TimeoutService.php +++ b/app/Services/TimeoutService.php @@ -19,23 +19,19 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; -use Psr\Http\Message\ServerRequestInterface; - -use function app; - /** * Check for PHP timeouts. */ class TimeoutService { - /** @var float Long-running scripts run in small chunks */ + //Long-running scripts run in small chunks private const TIME_LIMIT = 1.5; - /** @var float Seconds until we run out of time */ + // Seconds until we run out of time private const TIME_UP_THRESHOLD = 3.0; - /** @var float|null The start time of the request */ - private $start_time; + // The start time of the request + private float $start_time; /** * TimeoutService constructor. @@ -81,18 +77,4 @@ class TimeoutService return $now > $this->start_time + $limit; } - - /** - * @return float - */ - protected function startTime(): float - { - if ($this->start_time === null) { - $request = app(ServerRequestInterface::class); - - $this->start_time = (float) ($request->getServerParams()['REQUEST_TIME_FLOAT'] ?? microtime(true)); - } - - return $this->start_time; - } } diff --git a/app/SessionDatabaseHandler.php b/app/SessionDatabaseHandler.php index c36ac99c0e..e535c612b8 100644 --- a/app/SessionDatabaseHandler.php +++ b/app/SessionDatabaseHandler.php @@ -29,24 +29,27 @@ use stdClass; */ class SessionDatabaseHandler implements SessionHandlerInterface { - /** @var ServerRequestInterface */ - private $request; + private ServerRequestInterface $request; - /** @var stdClass|null The row from the session table */ - private $row; + private ?stdClass $row; + /** + * SessionDatabaseHandler constructor. + * + * @param ServerRequestInterface $request + */ public function __construct(ServerRequestInterface $request) { $this->request = $request; } /** - * @param string $save_path + * @param string $path * @param string $name * * @return bool */ - public function open($save_path, $name): bool + public function open($path, $name): bool { return true; } @@ -60,14 +63,14 @@ class SessionDatabaseHandler implements SessionHandlerInterface } /** - * @param string $session_id + * @param string $id * * @return string */ - public function read($session_id): string + public function read($id): string { $this->row = DB::table('session') - ->where('session_id', '=', $session_id) + ->where('session_id', '=', $id) ->first(); @@ -75,12 +78,12 @@ class SessionDatabaseHandler implements SessionHandlerInterface } /** - * @param string $session_id - * @param string $session_data + * @param string $id + * @param string $data * * @return bool */ - public function write($session_id, $session_data): bool + public function write($id, $data): bool { $ip_address = $this->request->getAttribute('client-ip'); $session_time = Carbon::now(); @@ -88,11 +91,11 @@ class SessionDatabaseHandler implements SessionHandlerInterface if ($this->row === null) { DB::table('session')->insert([ - 'session_id' => $session_id, + 'session_id' => $id, 'session_time' => $session_time, 'user_id' => $user_id, 'ip_address' => $ip_address, - 'session_data' => $session_data, + 'session_data' => $data, ]); } else { $updates = []; @@ -106,8 +109,8 @@ class SessionDatabaseHandler implements SessionHandlerInterface $updates['ip_address'] = $ip_address; } - if ($this->row->session_data !== $session_data) { - $updates['session_data'] = $session_data; + if ($this->row->session_data !== $data) { + $updates['session_data'] = $data; } if ($session_time->subMinute()->gt($this->row->session_time)) { @@ -116,7 +119,7 @@ class SessionDatabaseHandler implements SessionHandlerInterface if ($updates !== []) { DB::table('session') - ->where('session_id', '=', $session_id) + ->where('session_id', '=', $id) ->update($updates); } } @@ -125,28 +128,28 @@ class SessionDatabaseHandler implements SessionHandlerInterface } /** - * @param string $session_id + * @param string $id * * @return bool */ - public function destroy($session_id): bool + public function destroy($id): bool { DB::table('session') - ->where('session_id', '=', $session_id) + ->where('session_id', '=', $id) ->delete(); return true; } /** - * @param int $maxlifetime + * @param int $max_lifetime * * @return bool */ - public function gc($maxlifetime): bool + public function gc($max_lifetime): bool { DB::table('session') - ->where('session_time', '<', Carbon::now()->subSeconds($maxlifetime)) + ->where('session_time', '<', Carbon::now()->subSeconds($max_lifetime)) ->delete(); return true; diff --git a/tests/TestCase.php b/tests/TestCase.php index 7f5a5cf16e..e2c2ada252 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -22,22 +22,6 @@ namespace Fisharebest\Webtrees; use Aura\Router\Route; use Aura\Router\RouterContainer; use Fig\Http\Message\RequestMethodInterface; -use Fisharebest\Webtrees\Factories\CacheFactory; -use Fisharebest\Webtrees\Factories\FamilyFactory; -use Fisharebest\Webtrees\Factories\FilesystemFactory; -use Fisharebest\Webtrees\Factories\ElementFactory; -use Fisharebest\Webtrees\Factories\GedcomRecordFactory; -use Fisharebest\Webtrees\Factories\HeaderFactory; -use Fisharebest\Webtrees\Factories\IndividualFactory; -use Fisharebest\Webtrees\Factories\LocationFactory; -use Fisharebest\Webtrees\Factories\MediaFactory; -use Fisharebest\Webtrees\Factories\NoteFactory; -use Fisharebest\Webtrees\Factories\RepositoryFactory; -use Fisharebest\Webtrees\Factories\SlugFactory; -use Fisharebest\Webtrees\Factories\SourceFactory; -use Fisharebest\Webtrees\Factories\SubmissionFactory; -use Fisharebest\Webtrees\Factories\SubmitterFactory; -use Fisharebest\Webtrees\Factories\XrefFactory; use Fisharebest\Webtrees\Http\RequestHandlers\GedcomLoad; use Fisharebest\Webtrees\Http\Routes\WebRoutes; use Fisharebest\Webtrees\Module\ModuleThemeInterface; @@ -60,7 +44,6 @@ use function app; use function basename; use function filesize; use function http_build_query; -use function microtime; use const UPLOAD_ERR_OK; @@ -233,7 +216,7 @@ class TestCase extends \PHPUnit\Framework\TestCase $tree_service->importGedcomFile($tree, $stream, $gedcom_file); - $timeout_service = new TimeoutService(microtime(true)); + $timeout_service = new TimeoutService(); $controller = new GedcomLoad($timeout_service, $tree_service); $request = self::createRequest()->withAttribute('tree', $tree); diff --git a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php index f92df9c7a5..00cc5f1bbc 100644 --- a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php @@ -26,8 +26,7 @@ use Fisharebest\Webtrees\TestCase; */ class DefaultSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php index f27f384e21..b42375899f 100644 --- a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php @@ -22,12 +22,11 @@ namespace Fisharebest\Webtrees\SurnameTradition; use Fisharebest\Webtrees\TestCase; /** - * Test harness for the class SpanishSurnameTradition + * Test harness for the class IcelandicSurnameTradition */ class IcelandicSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php index 0c84143a1b..41acceda7e 100644 --- a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php @@ -22,12 +22,11 @@ namespace Fisharebest\Webtrees\SurnameTradition; use Fisharebest\Webtrees\TestCase; /** - * Test harness for the class SpanishSurnameTradition + * Test harness for the class LithuanianSurnameTraditionTest */ class LithuanianSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php index 4d099d26a9..91bbb92c44 100644 --- a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php @@ -22,12 +22,11 @@ namespace Fisharebest\Webtrees\SurnameTradition; use Fisharebest\Webtrees\TestCase; /** - * Test harness for the class PatrilinenalSurnameTradition + * Test harness for the class MatrilinenalSurnameTradition */ class MatrilinealSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php index 562db3eeaa..998c8fb42a 100644 --- a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php @@ -26,8 +26,7 @@ use Fisharebest\Webtrees\TestCase; */ class PaternalSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php index 9257cb81b4..f21e14b6eb 100644 --- a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php @@ -26,8 +26,7 @@ use Fisharebest\Webtrees\TestCase; */ class PatrilinealSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php index 8f9aaf876b..e219bdd2b8 100644 --- a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php @@ -22,12 +22,11 @@ namespace Fisharebest\Webtrees\SurnameTradition; use Fisharebest\Webtrees\TestCase; /** - * Test harness for the class SpanishSurnameTradition + * Test harness for the class PolishSurnameTradition */ class PolishSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php index 466c70cc83..80d997a8c1 100644 --- a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php @@ -22,12 +22,11 @@ namespace Fisharebest\Webtrees\SurnameTradition; use Fisharebest\Webtrees\TestCase; /** - * Test harness for the class SpanishSurnameTradition + * Test harness for the class PortugueseSurnameTradition */ class PortugueseSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests diff --git a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php index 6dab56fdd5..ac2f2937c0 100644 --- a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php @@ -26,8 +26,7 @@ use Fisharebest\Webtrees\TestCase; */ class SpanishSurnameTraditionTest extends TestCase { - /** @var SurnameTraditionInterface */ - private $surname_tradition; + private SurnameTraditionInterface $surname_tradition; /** * Prepare the environment for these tests |