From f1a8591dc30001d539e8509228103ee00b8cfccf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 2 Feb 2025 02:12:32 +0100 Subject: [PATCH] Continued: - added a lot more returned scalar type-hints and interfaces --- .../console/class_TestsConsoleMainCommand.php | 6 ++--- ...lass_TestsConsoleDefaultNewsController.php | 12 +++++----- ...TestConfigurationLoadableClassesFilter.php | 4 ++-- ...lass_TestsConfigurationIsEnabledFilter.php | 4 ++-- .../class_TestsPhpRequirementsFilter.php | 4 ++-- .../html/class_HtmlLoginProfileAction.php | 6 ++--- .../class_LoginAfterRegistrationAction.php | 4 ++-- .../classes/commands/class_BaseCommand.php | 4 ++-- .../console/class_ConsoleFuseCommand.php | 6 ++--- .../html/class_HtmlConfirmCommand.php | 6 ++--- .../commands/html/class_HtmlDoFormCommand.php | 6 ++--- .../commands/html/class_HtmlHomeCommand.php | 6 ++--- .../html/class_HtmlLoginAreaCommand.php | 8 +++---- .../commands/html/class_HtmlLoginCommand.php | 6 ++--- .../html/class_HtmlLoginFailedCommand.php | 6 ++--- .../commands/html/class_HtmlLogoutCommand.php | 6 ++--- .../html/class_HtmlLogoutDoneCommand.php | 6 ++--- .../html/class_HtmlProblemCommand.php | 6 ++--- .../html/class_HtmlRegisterCommand.php | 6 ++--- .../html/class_HtmlResendLinkCommand.php | 6 ++--- .../commands/html/class_HtmlStatusCommand.php | 6 ++--- .../image/class_ImageCodeCaptchaCommand.php | 6 ++--- .../controller/class_BaseController.php | 24 +++++++++---------- .../payment/class_LocalPaymentDiscovery.php | 6 ++--- framework/main/classes/feature/class_ | 4 ++-- .../feature/class_FrameworkFeature.php | 6 ++--- .../feature/fuse/class_FuseFeature.php | 4 ++-- .../filter/auth/class_UserAuthFilter.php | 10 ++++---- .../filter/change/class_EmailChangeFilter.php | 10 ++++---- .../change/class_PasswordChangeFilter.php | 9 ++++--- .../checkboxes/class_RulesAcceptedFilter.php | 6 ++--- .../filter/class_BaseFilterDecorator.php | 8 +++---- .../crypto/class_CaptchaEncryptFilter.php | 6 ++--- .../guest/class_UserNameIsGuestFilter.php | 6 ++--- .../filter/news/class_NewsDownloadFilter.php | 4 ++-- .../filter/news/class_NewsProcessFilter.php | 6 ++--- .../classes/filter/null/class_NullFilter.php | 6 ++--- .../payment/class_PaymentDiscoveryFilter.php | 8 +++---- .../class_UserStatusConfimedUpdateFilter.php | 6 ++--- .../filter/update/class_UserUpdateFilter.php | 6 ++--- .../validator/class_EmailValidatorFilter.php | 8 +++---- .../class_PasswordValidatorFilter.php | 4 ++-- .../class_UserNameValidatorFilter.php | 8 +++---- .../class_AccountPasswordVerifierFilter.php | 4 ++-- .../verifier/class_BirthdayVerifierFilter.php | 4 ++-- .../class_ConfirmCodeVerifierFilter.php | 4 ++-- .../verifier/class_EmailVerifierFilter.php | 4 ++-- ...ass_GraphicalCodeCaptchaVerifierFilter.php | 4 ++-- .../class_PasswordGuestVerifierFilter.php | 4 ++-- .../verifier/class_PasswordVerifierFilter.php | 4 ++-- .../class_UserGuestVerifierFilter.php | 6 ++--- .../verifier/class_UserNameVerifierFilter.php | 6 ++--- .../class_UserStatusVerifierFilter.php | 4 ++-- .../class_UserUnconfirmedVerifierFilter.php | 4 ++-- .../handler/tasks/class_TaskHandler.php | 18 +++++++------- .../registration/class_BaseRegistration.php | 10 ++++---- .../main/classes/states/class_BaseState.php | 6 ++--- .../classes/tasks/idle/class_IdleLoopTask.php | 8 +++---- .../actions/class_PerformableAction.php | 2 +- .../actions/commands/class_Commandable.php | 4 ++-- .../discovery/class_Discoverable.php | 4 ++-- .../main/interfaces/feature/class_Feature.php | 2 +- .../interfaces/filter/class_Filterable.php | 2 +- .../helper/login/class_HelpableLogin.php | 2 +- .../main/interfaces/tasks/class_Taskable.php | 6 ++--- .../template/view/class_ViewHelper.php | 2 +- 66 files changed, 199 insertions(+), 200 deletions(-) diff --git a/application/tests/classes/commands/console/class_TestsConsoleMainCommand.php b/application/tests/classes/commands/console/class_TestsConsoleMainCommand.php index a88b0971..4f422213 100644 --- a/application/tests/classes/commands/console/class_TestsConsoleMainCommand.php +++ b/application/tests/classes/commands/console/class_TestsConsoleMainCommand.php @@ -51,7 +51,7 @@ class TestsConsoleMainCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createTestsConsoleMainCommand (CommandResolver $resolverInstance) { + public static final function createTestsConsoleMainCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new TestsConsoleMainCommand(); @@ -69,7 +69,7 @@ class TestsConsoleMainCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Debug message /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TESTS-CONSOLE-MAIN-COMMAND: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('MAIN: --- Starting tests ... ---'); @@ -92,7 +92,7 @@ class TestsConsoleMainCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Add pre filters (e.g. for requirements checks) /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TESTS-CONSOLE-MAIN-COMMAND: controllerInstance=%s,requestInstance=%s - CALLED!', $controllerInstance->__toString(), $requestInstance->__toString())); $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('tests_php_requirements_filter_class')); diff --git a/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php b/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php index 630cf65a..2a6189d1 100644 --- a/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php +++ b/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php @@ -61,7 +61,7 @@ class TestsConsoleDefaultNewsController extends BaseController implements Contro * @param $resolverInstance An instance of a command resolver class * @return $controllerInstance A prepared instance of this class */ - public static final function createTestsConsoleDefaultNewsController (CommandResolver $resolverInstance) { + public static final function createTestsConsoleDefaultNewsController (CommandResolver $resolverInstance): Controller { // Create the instance /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TEST-CONSOLE-DEFAULT-NEWS-CONTROLLER: resolverInstance=%s - CALLED!', $resolverInstance->__toString())); $controllerInstance = new TestsConsoleDefaultNewsController(); @@ -85,7 +85,7 @@ class TestsConsoleDefaultNewsController extends BaseController implements Contro * @param $responseInstance An instance of a response class * @return void */ - public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { + public function handleRequest (Requestable $requestInstance, Responseable $responseInstance): void { // Get the command instance from the resolver by sending a request instance to the resolver /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TEST-CONSOLE-DEFAULT-NEWS-CONTROLLER: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $commandInstance = $this->getResolverInstance()->resolveCommandByRequest($requestInstance); @@ -120,7 +120,7 @@ class TestsConsoleDefaultNewsController extends BaseController implements Contro * @param $filterInstance A Filterable class * @return void */ - public function addBootstrapFilter (Filterable $filterInstance) { + public function addBootstrapFilter (Filterable $filterInstance): void { $this->addFilter('bootstrap', $filterInstance); } @@ -130,7 +130,7 @@ class TestsConsoleDefaultNewsController extends BaseController implements Contro * @param $filterInstance A Filterable class * @return void */ - public function addTestsFilter (Filterable $filterInstance) { + public function addTestsFilter (Filterable $filterInstance): void { $this->addFilter('tests', $filterInstance); } @@ -141,7 +141,7 @@ class TestsConsoleDefaultNewsController extends BaseController implements Contro * @param $responseInstance A Responseable class * @return void */ - public function executeBootstrapFilters (Requestable $requestInstance, Responseable $responseInstance) { + public function executeBootstrapFilters (Requestable $requestInstance, Responseable $responseInstance): void { $this->executeFilters('bootstrap', $requestInstance, $responseInstance); } @@ -152,7 +152,7 @@ class TestsConsoleDefaultNewsController extends BaseController implements Contro * @param $responseInstance A Responseable class * @return void */ - public function executeTestsFilters (Requestable $requestInstance, Responseable $responseInstance) { + public function executeTestsFilters (Requestable $requestInstance, Responseable $responseInstance): void { $this->executeFilters('tests', $requestInstance, $responseInstance); } diff --git a/application/tests/classes/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php b/application/tests/classes/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php index 38990d15..117d4021 100644 --- a/application/tests/classes/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php +++ b/application/tests/classes/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php @@ -50,7 +50,7 @@ class TestConfigurationLoadableClassesFilter extends BaseTestsFilter implements * * @return $filterInstance An instance of this filter class */ - public final static function createTestConfigurationLoadableClassesFilter () { + public final static function createTestConfigurationLoadableClassesFilter (): Filterable { // Get a new instance /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('TESTS-CONFIGURATION-LOADABLE-CLASSES-FILTER: CALLED!'); $filterInstance = new TestConfigurationLoadableClassesFilter(); @@ -67,7 +67,7 @@ class TestConfigurationLoadableClassesFilter extends BaseTestsFilter implements * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Init counter /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TESTS-CONFIGURATION-LOADABLE-CLASSES-FILTER: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $passed = $failed = $skipped = $warning = 0; diff --git a/application/tests/classes/filter/tests/configuration/is_enabled/class_TestsConfigurationIsEnabledFilter.php b/application/tests/classes/filter/tests/configuration/is_enabled/class_TestsConfigurationIsEnabledFilter.php index b2de7446..bc4590f6 100644 --- a/application/tests/classes/filter/tests/configuration/is_enabled/class_TestsConfigurationIsEnabledFilter.php +++ b/application/tests/classes/filter/tests/configuration/is_enabled/class_TestsConfigurationIsEnabledFilter.php @@ -51,7 +51,7 @@ class TestsConfigurationIsEnabledFilter extends BaseTestsFilter implements Filte * * @return $filterInstance An instance of this filter class */ - public final static function createTestsConfigurationIsEnabledFilter () { + public final static function createTestsConfigurationIsEnabledFilter (): Filterable { // Get a new instance /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('TESTS-CONFIGURATION-IS-ENABLED-FILTER: CALLED!'); $filterInstance = new TestsConfigurationIsEnabledFilter(); @@ -69,7 +69,7 @@ class TestsConfigurationIsEnabledFilter extends BaseTestsFilter implements Filte * @return void * @todo 0% done */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Init counter /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TESTS-CONFIGURATION-IS-ENABLED-FILTER: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $passed = $failed = $skipped = $warning = 0; diff --git a/application/tests/classes/filter/tests/requirements/class_TestsPhpRequirementsFilter.php b/application/tests/classes/filter/tests/requirements/class_TestsPhpRequirementsFilter.php index 2d8b9916..1ed99536 100644 --- a/application/tests/classes/filter/tests/requirements/class_TestsPhpRequirementsFilter.php +++ b/application/tests/classes/filter/tests/requirements/class_TestsPhpRequirementsFilter.php @@ -51,7 +51,7 @@ class TestsPhpRequirementsFilter extends BaseTestsFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createTestsPhpRequirementsFilter () { + public final static function createTestsPhpRequirementsFilter (): Filterable { // Get a new instance /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('TESTS-PHP-REQUIREMENTS-FILTER: CALLED!'); $filterInstance = new TestsPhpRequirementsFilter(); @@ -69,7 +69,7 @@ class TestsPhpRequirementsFilter extends BaseTestsFilter implements Filterable { * @return void * @todo 0% done */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Init counter /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TESTS-PHP-REQUIREMENTS-FILTER: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $passed = $failed = $skipped = $warning = 0; diff --git a/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php b/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php index 36e73d9c..d2a9dec8 100644 --- a/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php +++ b/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php @@ -50,7 +50,7 @@ class HtmlLoginProfileAction extends BaseAction implements PerformableAction, Re * @param $resolverInstance An instance of an action resolver * @return $actionInstance An instance of this action class */ - public static final function createHtmlLoginProfileAction (ActionResolver $resolverInstance) { + public static final function createHtmlLoginProfileAction (ActionResolver $resolverInstance): PerformableAction { // Get a new instance /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('HTML-LOGIN-PROFILE-ACTION: resolverInstance=%s - CALLED!', $resolverInstance->__toString())); $actionInstance = new HtmlLoginProfileAction(); @@ -70,7 +70,7 @@ class HtmlLoginProfileAction extends BaseAction implements PerformableAction, Re * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Dummy method /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('HTML-LOGIN-PROFILE-ACTION: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); } @@ -82,7 +82,7 @@ class HtmlLoginProfileAction extends BaseAction implements PerformableAction, Re * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Add user status filter here /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('HTML-LOGIN-PROFILE-ACTION: controllerInstance=%s,requestInstance=%s - CALLED!', $controllerInstance->__toString(), $requestInstance->__toString())); $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter_class')); diff --git a/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php b/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php index 6868102f..15a884c6 100644 --- a/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php +++ b/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php @@ -47,7 +47,7 @@ class LoginAfterRegistrationAction extends BaseAction implements PerformableActi * * @return $actionInstance An instance of this action class */ - public static final function createLoginAfterRegistrationAction () { + public static final function createLoginAfterRegistrationAction (): PerformableAction { // Get a new instance /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('LOGIN-REGISTRATION-ACTION: CALLED!'); $actionInstance = new LoginAfterRegistrationAction(); @@ -64,7 +64,7 @@ class LoginAfterRegistrationAction extends BaseAction implements PerformableActi * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get a login class from factory /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('LOGIN-REGISTRATION-ACTION: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $loginInstance = LoginFactory::createLoginObjectByRequest($requestInstance); diff --git a/framework/main/classes/commands/class_BaseCommand.php b/framework/main/classes/commands/class_BaseCommand.php index 754217da..b22415e9 100644 --- a/framework/main/classes/commands/class_BaseCommand.php +++ b/framework/main/classes/commands/class_BaseCommand.php @@ -62,7 +62,7 @@ abstract class BaseCommand extends BaseFrameworkSystem { * @return void * @throws InvalidArgumentException If a parameter has an invalid value */ - public final function initTemplateEngine (string $templateType) { + public final function initTemplateEngine (string $templateType): void { // Check paramter /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-COMMAND: templateType=%s - CALLED!', $templateType)); if (empty($templateType)) { @@ -90,7 +90,7 @@ abstract class BaseCommand extends BaseFrameworkSystem { * @return void * @throws BadMethodCallException If a POST request ended here */ - protected function sendGenericGetResponse (Requestable $requestInstance, Responseable $responseInstance, string $suffix = '') { + protected function sendGenericGetResponse (Requestable $requestInstance, Responseable $responseInstance, string $suffix = ''): void { // Check conditions /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-COMMAND: requestInstance=%s,responseInstance=%s,suffix=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString(), $suffix)); if ($requestInstance->isPostRequestMethod()) { diff --git a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php index c8061ffc..47b755a2 100644 --- a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php +++ b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php @@ -51,7 +51,7 @@ class ConsoleFuseCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public final static function createConsoleFuseCommand (CommandResolver $resolverInstance) { + public final static function createConsoleFuseCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new ConsoleFuseCommand(); @@ -69,7 +69,7 @@ class ConsoleFuseCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Is the feature available? if (!FrameworkFeature::isFeatureAvailable('fuse')) { // Feature not available, cannot continue @@ -93,7 +93,7 @@ class ConsoleFuseCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty for now ... } diff --git a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php index 79f8bdf4..9901706f 100644 --- a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php +++ b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php @@ -55,7 +55,7 @@ class HtmlConfirmCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlConfirmCommand (CommandResolver $resolverInstance) { + public static final function createHtmlConfirmCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlConfirmCommand(); @@ -73,7 +73,7 @@ class HtmlConfirmCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get the application instance $applicationInstance = ApplicationHelper::getSelfInstance(); @@ -151,7 +151,7 @@ class HtmlConfirmCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty for now } diff --git a/framework/main/classes/commands/html/class_HtmlDoFormCommand.php b/framework/main/classes/commands/html/class_HtmlDoFormCommand.php index c03af4aa..b6111fb1 100644 --- a/framework/main/classes/commands/html/class_HtmlDoFormCommand.php +++ b/framework/main/classes/commands/html/class_HtmlDoFormCommand.php @@ -49,7 +49,7 @@ class HtmlDoFormCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlDoFormCommand (CommandResolver $resolverInstance) { + public static final function createHtmlDoFormCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlDoFormCommand(); @@ -67,7 +67,7 @@ class HtmlDoFormCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Should never be reached... $this->debugBackTrace('This should never be reached.'); } @@ -79,7 +79,7 @@ class HtmlDoFormCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty for now } diff --git a/framework/main/classes/commands/html/class_HtmlHomeCommand.php b/framework/main/classes/commands/html/class_HtmlHomeCommand.php index e532c2d2..6df8f484 100644 --- a/framework/main/classes/commands/html/class_HtmlHomeCommand.php +++ b/framework/main/classes/commands/html/class_HtmlHomeCommand.php @@ -52,7 +52,7 @@ class HtmlHomeCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlHomeCommand (CommandResolver $resolverInstance) { + public static final function createHtmlHomeCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlHomeCommand(); @@ -70,7 +70,7 @@ class HtmlHomeCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get the application instance $applicationInstance = ApplicationHelper::getSelfInstance(); @@ -135,7 +135,7 @@ class HtmlHomeCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty for now } diff --git a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php index 0c59b7ef..e8b8a053 100644 --- a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php @@ -60,7 +60,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlLoginAreaCommand (CommandResolver $resolverInstance) { + public static final function createHtmlLoginAreaCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlLoginAreaCommand(); @@ -80,7 +80,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable { * @return void * @todo Add some stuff here: Some personal data, app/game related data */ - protected function prepareCommand () { + protected function prepareCommand (): void { } /** @@ -90,7 +90,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get the action instance from registry $actionInstance = ObjectRegistry::getRegistry('generic')->getInstance('action'); @@ -174,7 +174,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Get our application instance from the registry $applicationInstance = ApplicationHelper::getSelfInstance(); diff --git a/framework/main/classes/commands/html/class_HtmlLoginCommand.php b/framework/main/classes/commands/html/class_HtmlLoginCommand.php index bea535be..9b25923d 100644 --- a/framework/main/classes/commands/html/class_HtmlLoginCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLoginCommand.php @@ -53,7 +53,7 @@ class HtmlLoginCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlLoginCommand (CommandResolver $resolverInstance) { + public static final function createHtmlLoginCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlLoginCommand(); @@ -71,7 +71,7 @@ class HtmlLoginCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Set request instance as extra instance ObjectRegistry::getRegistry('generic')->addInstance('extra', $this); @@ -141,7 +141,7 @@ class HtmlLoginCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty for now } diff --git a/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php b/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php index e64f6ec0..94cf1f57 100644 --- a/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php @@ -52,7 +52,7 @@ class HtmlLoginFailedCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlLoginFailedCommand (CommandResolver $resolverInstance) { + public static final function createHtmlLoginFailedCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlLoginFailedCommand(); @@ -70,7 +70,7 @@ class HtmlLoginFailedCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get the application instance $applicationInstance = ApplicationHelper::getSelfInstance(); @@ -137,7 +137,7 @@ class HtmlLoginFailedCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty for now } diff --git a/framework/main/classes/commands/html/class_HtmlLogoutCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutCommand.php index 9951a262..bd629419 100644 --- a/framework/main/classes/commands/html/class_HtmlLogoutCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLogoutCommand.php @@ -50,7 +50,7 @@ class HtmlLogoutCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlLogoutCommand (CommandResolver $resolverInstance) { + public static final function createHtmlLogoutCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlLogoutCommand(); @@ -68,7 +68,7 @@ class HtmlLogoutCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get an auth instance for checking and updating the auth cookies $authInstance = ObjectFactory::createObjectByConfiguredName('auth_method_class', array($responseInstance)); @@ -89,7 +89,7 @@ class HtmlLogoutCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty for now } diff --git a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php index b70a9d4c..6cf4ce4f 100644 --- a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php @@ -52,7 +52,7 @@ class HtmlLogoutDoneCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlLogoutDoneCommand (CommandResolver $resolverInstance) { + public static final function createHtmlLogoutDoneCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlLogoutDoneCommand(); @@ -70,7 +70,7 @@ class HtmlLogoutDoneCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get the application instance $applicationInstance = ApplicationHelper::getSelfInstance(); @@ -137,7 +137,7 @@ class HtmlLogoutDoneCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty for now } diff --git a/framework/main/classes/commands/html/class_HtmlProblemCommand.php b/framework/main/classes/commands/html/class_HtmlProblemCommand.php index c6f35a72..720c6cd1 100644 --- a/framework/main/classes/commands/html/class_HtmlProblemCommand.php +++ b/framework/main/classes/commands/html/class_HtmlProblemCommand.php @@ -50,7 +50,7 @@ class HtmlProblemCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlProblemCommand (CommandResolver $resolverInstance) { + public static final function createHtmlProblemCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlProblemCommand(); @@ -69,7 +69,7 @@ class HtmlProblemCommand extends BaseCommand implements Commandable { * @return void * @todo 0% done */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { DebugMiddleware::getSelfInstance()->partialStub('Unfinished method.'); } @@ -80,7 +80,7 @@ class HtmlProblemCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty for now } diff --git a/framework/main/classes/commands/html/class_HtmlRegisterCommand.php b/framework/main/classes/commands/html/class_HtmlRegisterCommand.php index 56b26085..daf740ad 100644 --- a/framework/main/classes/commands/html/class_HtmlRegisterCommand.php +++ b/framework/main/classes/commands/html/class_HtmlRegisterCommand.php @@ -53,7 +53,7 @@ class HtmlRegisterCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlRegisterCommand (CommandResolver $resolverInstance) { + public static final function createHtmlRegisterCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlRegisterCommand(); @@ -71,7 +71,7 @@ class HtmlRegisterCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Set request instance as extra instance ObjectRegistry::getRegistry('generic')->addInstance('extra', $this); @@ -142,7 +142,7 @@ class HtmlRegisterCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty method } diff --git a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php index 9d4a57d4..4cf80330 100644 --- a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php +++ b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php @@ -55,7 +55,7 @@ class HtmlResendLinkCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlResendLinkCommand (CommandResolver $resolverInstance) { + public static final function createHtmlResendLinkCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlResendLinkCommand(); @@ -73,7 +73,7 @@ class HtmlResendLinkCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get user instance from registry $userInstance = ObjectRegistry::getRegistry('generic')->getInstance('user'); @@ -139,7 +139,7 @@ class HtmlResendLinkCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Filter for checking if account is unconfirmed $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_unconfirmed_filter_class')); } diff --git a/framework/main/classes/commands/html/class_HtmlStatusCommand.php b/framework/main/classes/commands/html/class_HtmlStatusCommand.php index e53e02b7..db8544b3 100644 --- a/framework/main/classes/commands/html/class_HtmlStatusCommand.php +++ b/framework/main/classes/commands/html/class_HtmlStatusCommand.php @@ -52,7 +52,7 @@ class HtmlStatusCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createHtmlStatusCommand (CommandResolver $resolverInstance) { + public static final function createHtmlStatusCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new HtmlStatusCommand(); @@ -71,7 +71,7 @@ class HtmlStatusCommand extends BaseCommand implements Commandable { * @return void * @todo 0% done */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get the application instance $applicationInstance = ApplicationHelper::getSelfInstance(); @@ -135,7 +135,7 @@ class HtmlStatusCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Empty for now } diff --git a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php index 0491a952..1d0da058 100644 --- a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php +++ b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php @@ -50,7 +50,7 @@ class ImageCodeCaptchaCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createImageCodeCaptchaCommand (CommandResolver $resolverInstance) { + public static final function createImageCodeCaptchaCommand (CommandResolver $resolverInstance): Commandable { // Get new instance $commandInstance = new ImageCodeCaptchaCommand(); @@ -68,7 +68,7 @@ class ImageCodeCaptchaCommand extends BaseCommand implements Commandable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get the decrypted string from request (previously created by a filter!) $decryptedCode = $requestInstance->getRequestElement('decrypted'); @@ -98,7 +98,7 @@ class ImageCodeCaptchaCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { + public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void { // Extra filters here... } diff --git a/framework/main/classes/controller/class_BaseController.php b/framework/main/classes/controller/class_BaseController.php index 421ba3b2..71f5f8c1 100644 --- a/framework/main/classes/controller/class_BaseController.php +++ b/framework/main/classes/controller/class_BaseController.php @@ -92,7 +92,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @param $responseInstance A Responseable class * @return void */ - public function executeGenericPrePostCommand (Requestable $requestInstance, Responseable $responseInstance) { + public function executeGenericPrePostCommand (Requestable $requestInstance, Responseable $responseInstance): void { // Get the command instance from the resolver by sending a request instance to the resolver //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $commandInstance = $this->getResolverInstance()->resolveCommandByRequest($requestInstance); @@ -127,7 +127,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @param $responseInstance An instance of a Responseable class * @return void */ - public function genericHanleRequestLoginFailedRedirect (Requestable $requestInstance, Responseable $responseInstance) { + public function genericHanleRequestLoginFailedRedirect (Requestable $requestInstance, Responseable $responseInstance): void { // Get the "form action" //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $formAction = $requestInstance->getRequestElement('form'); @@ -177,7 +177,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @param $responseInstance An instance of a Responseable class * @return void */ - public function genericHanleRequestLoginAreaFailedRedirect (Requestable $requestInstance, Responseable $responseInstance) { + public function genericHanleRequestLoginAreaFailedRedirect (Requestable $requestInstance, Responseable $responseInstance): void { // Get the command instance from the resolver by sending a request instance to the resolver //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $commandInstance = $this->getResolverInstance()->resolveCommandByRequest($requestInstance); @@ -221,7 +221,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @throws InvalidArgumentException If a parameter has an invalid value * @throws BadMethodCallException If the given filter chain is already initialized */ - protected function initFilterChain (string $filterChain) { + protected function initFilterChain (string $filterChain): void { // Check parameter //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: filterChain=%s - CALLED!', $filterChain)); if (empty($filterChain)) { @@ -249,7 +249,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @throws InvalidArgumentException If a parameter has an invalid value * @throws BadMethodCallException If the given filter chain is not yet initialized */ - protected function addFilter (string $filterChain, Filterable $filterInstance) { + protected function addFilter (string $filterChain, Filterable $filterInstance): void { // Check parameter //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: filterChain=%s,filterInstance=%s - CALLED!', $filterChain, $filterInstance->__toString())); if (empty($filterChain)) { @@ -274,7 +274,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @param $filterInstance An instance of a filter * @return void */ - public function addPreFilter (Filterable $filterInstance) { + public function addPreFilter (Filterable $filterInstance): void { // Add the pre filter //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: filterInstance=%s - CALLED!', $filterInstance->__toString())); $this->addFilter(self::FILTER_CHAIN_PRE_COMMAND, $filterInstance); @@ -289,7 +289,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @param $filterInstance An instance of a filter * @return void */ - public function addPostFilter (Filterable $filterInstance) { + public function addPostFilter (Filterable $filterInstance): void { // Add post filter //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: filterInstance=%s - CALLED!', $filterInstance->__toString())); $this->addFilter(self::FILTER_CHAIN_POST_COMMAND, $filterInstance); @@ -304,7 +304,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @param $filterInstance A Filterable class * @return void */ - public function addShutdownFilter (Filterable $filterInstance) { + public function addShutdownFilter (Filterable $filterInstance): void { // Add shutdown filter //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: filterInstance=%s - CALLED!', $filterInstance->__toString())); $this->addFilter(self::FILTER_CHAIN_SHUTDOWN, $filterInstance); @@ -322,7 +322,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @return void * @throws InvalidArgumentException If the filter chain is invalid */ - protected function executeFilters (string $filterChain, Requestable $requestInstance, Responseable $responseInstance) { + protected function executeFilters (string $filterChain, Requestable $requestInstance, Responseable $responseInstance): void { // Check parameter //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: filterChain=%s,requestInstance=%s,responseInstance=%s - CALLED!', $filterChain, $requestInstance->__toString(), $responseInstance->__toString())); if (empty($filterChain)) { @@ -348,7 +348,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @param $responseInstance An instance of a Responseable class * @return void */ - protected function executePreFilters (Requestable $requestInstance, Responseable $responseInstance) { + protected function executePreFilters (Requestable $requestInstance, Responseable $responseInstance): void { // Execute all pre filters //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $this->executeFilters(self::FILTER_CHAIN_PRE_COMMAND, $requestInstance, $responseInstance); @@ -364,7 +364,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @param $responseInstance An instance of a Responseable class * @return void */ - protected function executePostFilters (Requestable $requestInstance, Responseable $responseInstance) { + protected function executePostFilters (Requestable $requestInstance, Responseable $responseInstance): void { // Execute all post filters //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $this->executeFilters(self::FILTER_CHAIN_POST_COMMAND, $requestInstance, $responseInstance); @@ -380,7 +380,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl * @param $responseInstance A Responseable class * @return void */ - public function executeShutdownFilters (Requestable $requestInstance, Responseable $responseInstance) { + public function executeShutdownFilters (Requestable $requestInstance, Responseable $responseInstance): void { // Execute all shutdown filter //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-CONTROLLER: requestInstance=%s,responseInstance=%s - CALLED!', $requestInstance->__toString(), $responseInstance->__toString())); $this->executeFilters(self::FILTER_CHAIN_SHUTDOWN, $requestInstance, $responseInstance); diff --git a/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php b/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php index a81e2bad..00272634 100644 --- a/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php +++ b/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php @@ -57,7 +57,7 @@ class LocalPaymentDiscovery extends BaseDiscovery implements Discoverable, Regis * @param $filterInstance An instance of a filter * @return $discoveryInstance An instance of this discovery class */ - public static final function createLocalPaymentDiscovery (Filterable $filterInstance) { + public static final function createLocalPaymentDiscovery (Filterable $filterInstance): Discoverable { // Get an instance of this class $discoveryInstance = new LocalPaymentDiscovery(); @@ -74,7 +74,7 @@ class LocalPaymentDiscovery extends BaseDiscovery implements Discoverable, Regis * @param $requestInstance An instance of a Requestable class * @return void */ - public function discover (Requestable $requestInstance) { + public function discover (Requestable $requestInstance): void { // Now get a search criteria and set app name and payment action as search critera $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); $criteriaInstance->addCriteria('app_name', $requestInstance->getRequestElement('app')); @@ -101,7 +101,7 @@ class LocalPaymentDiscovery extends BaseDiscovery implements Discoverable, Regis * @return void * @todo 0% done */ - public function addResultsToHelper (HelpableTemplate $helperInstance) { + public function addResultsToHelper (HelpableTemplate $helperInstance): void { // Undone part } diff --git a/framework/main/classes/feature/class_ b/framework/main/classes/feature/class_ index 4cad8ab6..fcaffedc 100644 --- a/framework/main/classes/feature/class_ +++ b/framework/main/classes/feature/class_ @@ -45,7 +45,7 @@ class ???Feature extends BaseFeature implements Feature { * * @return $featureInstance An instance of this Feature class */ - public final static function create???Feature () { + public final static function create???Feature (): Feature { // Get a new instance $featureInstance = new ???Feature(); @@ -59,7 +59,7 @@ class ???Feature extends BaseFeature implements Feature { * @return $isAvailable Whether this feature is available * @todo 0% done */ - public function isFeatureAvailable () { + public function isFeatureAvailable (): bool { // Default is not available $isAvailable = false; diff --git a/framework/main/classes/feature/class_FrameworkFeature.php b/framework/main/classes/feature/class_FrameworkFeature.php index 3d2fbeb7..180d82c6 100644 --- a/framework/main/classes/feature/class_FrameworkFeature.php +++ b/framework/main/classes/feature/class_FrameworkFeature.php @@ -80,7 +80,7 @@ class FrameworkFeature extends BaseFrameworkSystem { * @return $isEnabled Whether the given feature is enabled * @throws InvalidArgumentException If a parameter is invalid */ - public static function isFeatureEnabled (string $featureName) { + public static function isFeatureEnabled (string $featureName): bool { // Check parameter //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('FRAMEWORK-FEATURE: featureName=%s - CALLED!', $featureName)); if (empty($featureName)) { @@ -113,7 +113,7 @@ class FrameworkFeature extends BaseFrameworkSystem { * @return $isAvailable Whether the given feature is available * @throws InvalidArgumentException If a parameter is invalid */ - public static function isFeatureAvailable (string $featureName) { + public static function isFeatureAvailable (string $featureName): bool { // Check parameter //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('FRAMEWORK-FEATURE: featureName=%s - CALLED!', $featureName)); if (empty($featureName)) { @@ -169,7 +169,7 @@ class FrameworkFeature extends BaseFrameworkSystem { * @throws BadMethodCallException If this method has been invoked but the feature isn't available * @throws FeatureMethodNotCallableException If the requested method cannot be called */ - public static function callFeature (string $featureName, string $featureMethod, array $args = NULL) { + public static function callFeature (string $featureName, string $featureMethod, array $args = NULL): mixed { // Check parameter //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('FRAMEWORK-FEATURE: featureName=%s,featureMethod=%s,args[]=%s - CALLED!', $featureName, $featureMethod, gettype($args))); if (empty($featureName)) { diff --git a/framework/main/classes/feature/fuse/class_FuseFeature.php b/framework/main/classes/feature/fuse/class_FuseFeature.php index fb039d41..2a19409c 100644 --- a/framework/main/classes/feature/fuse/class_FuseFeature.php +++ b/framework/main/classes/feature/fuse/class_FuseFeature.php @@ -45,7 +45,7 @@ class FuseFeature extends BaseFeature implements Feature { * * @return $featureInstance An instance of this Feature class */ - public final static function createFuseFeature () { + public final static function createFuseFeature (): Feature { // Get a new instance $featureInstance = new FuseFeature(); @@ -59,7 +59,7 @@ class FuseFeature extends BaseFeature implements Feature { * @return $isAvailable Whether this feature is available * @todo 0% done */ - public function isFeatureAvailable () { + public function isFeatureAvailable (): bool { // Default is not available $isAvailable = false; diff --git a/framework/main/classes/filter/auth/class_UserAuthFilter.php b/framework/main/classes/filter/auth/class_UserAuthFilter.php index 41d9b135..b1745c5d 100644 --- a/framework/main/classes/filter/auth/class_UserAuthFilter.php +++ b/framework/main/classes/filter/auth/class_UserAuthFilter.php @@ -58,9 +58,9 @@ class UserAuthFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createUserAuthFilter () { + public static final function createUserAuthFilter (): Filterable { // Get a new instance $filterInstance = new UserAuthFilter(); @@ -76,7 +76,7 @@ class UserAuthFilter extends BaseFilter implements Filterable { * * @return void */ - protected function setDefaultAuthMethod () { + protected function setDefaultAuthMethod (): void { $this->authMethod = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('auth_method_class'); } @@ -90,9 +90,9 @@ class UserAuthFilter extends BaseFilter implements Filterable { * @throws UserPasswordMismatchException If the supplied password hash does not match * @throws NoClassException If the user (guest/member) class was not found */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Then get an auth instance for checking and updating the auth cookies - $authInstance = ObjectFactory::createObjectByName($this->authMethod, array($responseInstance)); + $authInstance = ObjectFactory::createObjectByName($this->authMethod, [$responseInstance]); // Now, get the auth data for comparison $authLogin = $authInstance->getUserAuth(); diff --git a/framework/main/classes/filter/change/class_EmailChangeFilter.php b/framework/main/classes/filter/change/class_EmailChangeFilter.php index dcde36f1..f45e6a63 100644 --- a/framework/main/classes/filter/change/class_EmailChangeFilter.php +++ b/framework/main/classes/filter/change/class_EmailChangeFilter.php @@ -47,9 +47,9 @@ class EmailChangeFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createEmailChangeFilter () { + public static final function createEmailChangeFilter (): Filterable { // Get a new instance $filterInstance = new EmailChangeFilter(); @@ -66,7 +66,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable { * @throws FilterChainException If this filter fails to operate * @todo Implement email change of the user here. HINT: Use the User class! */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get both emails $email1 = $requestInstance->getRequestElement('email1'); $email2 = $requestInstance->getRequestElement('email2'); @@ -110,7 +110,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable { // Are email and confirmation empty? if ((empty($email1)) && (empty($email2))) { // No email change required! - return true; + return; } // Now, get a user instance for comparison @@ -122,7 +122,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable { // Are they different? if ($userEmail == $email1) { // Nothing has been changed is fine... - return true; + return; } // Update the "new_email" field diff --git a/framework/main/classes/filter/change/class_PasswordChangeFilter.php b/framework/main/classes/filter/change/class_PasswordChangeFilter.php index 4d878637..0c993e19 100644 --- a/framework/main/classes/filter/change/class_PasswordChangeFilter.php +++ b/framework/main/classes/filter/change/class_PasswordChangeFilter.php @@ -47,10 +47,9 @@ class PasswordChangeFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @param $controllerInstance An instance of a controller class - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createPasswordChangeFilter () { + public static final function createPasswordChangeFilter (): Filterable { // Get a new instance $filterInstance = new PasswordChangeFilter(); @@ -67,7 +66,7 @@ class PasswordChangeFilter extends BaseFilter implements Filterable { * @todo Finished updating user password hash here. HINT: Use the User class again. * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get both passwords $pass1 = $requestInstance->getRequestElement('pass1'); $pass2 = $requestInstance->getRequestElement('pass2'); @@ -99,7 +98,7 @@ class PasswordChangeFilter extends BaseFilter implements Filterable { // Are password and confirmation empty? if ((empty($pass1)) && (empty($pass2))) { // Don't change password here - return true; + return; } // Do both match? diff --git a/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php b/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php index 43e06a12..73bc69c2 100644 --- a/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php +++ b/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php @@ -47,9 +47,9 @@ class RulesAcceptedFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createRulesAcceptedFilter () { + public static final function createRulesAcceptedFilter (): Filterable { // Get a new instance $filterInstance = new RulesAcceptedFilter(); @@ -65,7 +65,7 @@ class RulesAcceptedFilter extends BaseFilter implements Filterable { * @return void * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get the "rules" value from request $rules = $requestInstance->getRequestElement('rules'); diff --git a/framework/main/classes/filter/class_BaseFilterDecorator.php b/framework/main/classes/filter/class_BaseFilterDecorator.php index b75e5932..652a4b6c 100644 --- a/framework/main/classes/filter/class_BaseFilterDecorator.php +++ b/framework/main/classes/filter/class_BaseFilterDecorator.php @@ -52,7 +52,7 @@ abstract class BaseFilterDecorator extends BaseFrameworkSystem implements Filter * @param $filterInstance An instance of a filter * @return void */ - protected final function setFilterInstance (Filterable $filterInstance) { + protected final function setFilterInstance (Filterable $filterInstance): void { $this->filterInstance = $filterInstance; } @@ -61,7 +61,7 @@ abstract class BaseFilterDecorator extends BaseFrameworkSystem implements Filter * * @return $filterInstance An instance of a filter */ - protected final function getFilterInstance () { + protected final function getFilterInstance (): Filterable { return $this->filterInstance; } @@ -72,7 +72,7 @@ abstract class BaseFilterDecorator extends BaseFrameworkSystem implements Filter * @param $responseInstance An instance of a Responseable class * @return void */ - public final function execute (Requestable $requestInstance, Responseable $responseInstance) { + public final function execute (Requestable $requestInstance, Responseable $responseInstance): void { $this->getFilterInstance()->execute($requestInstance, $responseInstance); } @@ -84,6 +84,6 @@ abstract class BaseFilterDecorator extends BaseFrameworkSystem implements Filter * @param $responseInstance An instance of a Responseable class * @return void */ - abstract public function doExecute (Requestable $requestInstance, Responseable $responseInstance); + abstract public function doExecute (Requestable $requestInstance, Responseable $responseInstance): void; } diff --git a/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php b/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php index aaab8dff..bb043e51 100644 --- a/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php +++ b/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php @@ -47,9 +47,9 @@ class CaptchaEncryptFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createCaptchaEncryptFilter () { + public static final function createCaptchaEncryptFilter (): Filterable { // Get a new instance $filterInstance = new CaptchaEncryptFilter(); @@ -65,7 +65,7 @@ class CaptchaEncryptFilter extends BaseFilter implements Filterable { * @return void * @throws EncryptMissingException If the "encrypt" value is not set */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get "encrypt" string barely from the request $encryptRequest = $requestInstance->getRequestElement('encrypt'); diff --git a/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php b/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php index d05523f1..ca072c3c 100644 --- a/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php +++ b/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php @@ -46,9 +46,9 @@ class UserNameIsGuestFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createUserNameIsGuestFilter () { + public static final function createUserNameIsGuestFilter (): Filterable { // Get a new instance $filterInstance = new UserNameIsGuestFilter(); @@ -63,7 +63,7 @@ class UserNameIsGuestFilter extends BaseFilter implements Filterable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get username from request $userName = $requestInstance->getRequestElement('username'); diff --git a/framework/main/classes/filter/news/class_NewsDownloadFilter.php b/framework/main/classes/filter/news/class_NewsDownloadFilter.php index 0737f283..99ad43d7 100644 --- a/framework/main/classes/filter/news/class_NewsDownloadFilter.php +++ b/framework/main/classes/filter/news/class_NewsDownloadFilter.php @@ -50,7 +50,7 @@ class NewsDownloadFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createNewsDownloadFilter () { + public static final function createNewsDownloadFilter (): Filterable { // Get a new instance $filterInstance = new NewsDownloadFilter(); @@ -65,7 +65,7 @@ class NewsDownloadFilter extends BaseFilter implements Filterable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get a news instance $newsInstance = HtmlNewsFactory::createFactoryByRequest($requestInstance); diff --git a/framework/main/classes/filter/news/class_NewsProcessFilter.php b/framework/main/classes/filter/news/class_NewsProcessFilter.php index f9f9b834..03952902 100644 --- a/framework/main/classes/filter/news/class_NewsProcessFilter.php +++ b/framework/main/classes/filter/news/class_NewsProcessFilter.php @@ -45,9 +45,9 @@ class NewsProcessFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createNewsProcessFilter () { + public static final function createNewsProcessFilter (): Filterable { // Get a new instance $filterInstance = new NewsProcessFilter(); @@ -63,7 +63,7 @@ class NewsProcessFilter extends BaseFilter implements Filterable { * @return void * @todo Unfinished stub, add functionality here */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { } } diff --git a/framework/main/classes/filter/null/class_NullFilter.php b/framework/main/classes/filter/null/class_NullFilter.php index e5093c88..362fe55f 100644 --- a/framework/main/classes/filter/null/class_NullFilter.php +++ b/framework/main/classes/filter/null/class_NullFilter.php @@ -45,9 +45,9 @@ class NullFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createNullFilter () { + public static final function createNullFilter (): Filterable { // Get a new instance $filterInstance = new NullFilter(); @@ -62,7 +62,7 @@ class NullFilter extends BaseFilter implements Filterable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Not implemented, just passing through } diff --git a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php index 1536aec8..09fe7e53 100644 --- a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php +++ b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php @@ -62,7 +62,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable { * @return $filterInstance An instance of this filter class * @throws NullPointerException If the resolver is not set */ - public static final function createPaymentDiscoveryFilter (PerformableAction $actionInstance) { + public static final function createPaymentDiscoveryFilter (PerformableAction $actionInstance): Filterable { // Get a new instance $filterInstance = new PaymentDiscoveryFilter(); @@ -91,7 +91,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable { * @param $actionName Action name to set * @return void */ - protected final function setActionName (string $actionName) { + protected final function setActionName (string $actionName): void { $this->actionName = $actionName; } @@ -100,7 +100,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable { * * @return $actionName Action name to set */ - public final function getActionName () { + public final function getActionName (): string { return $this->actionName; } @@ -113,7 +113,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable { * @todo 0% done * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Try to get real discovery class try { // Get an instance from the object factory diff --git a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php index e94a6ba0..0e45b427 100644 --- a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php +++ b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php @@ -47,9 +47,9 @@ class UserStatusConfimedUpdateFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createUserStatusConfimedUpdateFilter () { + public static final function createUserStatusConfimedUpdateFilter (): Filterable { // Get a new instance $filterInstance = new UserStatusConfimedUpdateFilter(); @@ -64,7 +64,7 @@ class UserStatusConfimedUpdateFilter extends BaseFilter implements Filterable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get user instance from registry $userInstance = ObjectRegistry::getRegistry('generic')->getInstance('user'); diff --git a/framework/main/classes/filter/update/class_UserUpdateFilter.php b/framework/main/classes/filter/update/class_UserUpdateFilter.php index ac688fd8..2ee3b602 100644 --- a/framework/main/classes/filter/update/class_UserUpdateFilter.php +++ b/framework/main/classes/filter/update/class_UserUpdateFilter.php @@ -46,9 +46,9 @@ class UserUpdateFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createUserUpdateFilter () { + public static final function createUserUpdateFilter (): Filterable { // Get a new instance $filterInstance = new UserUpdateFilter(); @@ -64,7 +64,7 @@ class UserUpdateFilter extends BaseFilter implements Filterable { * @return void * @todo Add more user updates here */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get user instance from registry $userInstance = ObjectRegistry::getRegistry('generic')->getInstance('user'); diff --git a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php index 01b631d6..95cf41a0 100644 --- a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php +++ b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php @@ -50,9 +50,9 @@ class EmailValidatorFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createEmailValidatorFilter () { + public static final function createEmailValidatorFilter (): Filterable { // Get a new instance $filterInstance = new EmailValidatorFilter(); @@ -68,7 +68,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable { * @return void * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get Email from request $email = $requestInstance->getRequestElement('email'); @@ -143,7 +143,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable { * @param $email Email to check for existence * @return $alreadyTaken Whether the email has been taken */ - private function ifEmailIsTaken (string $email) { + private function ifEmailIsTaken (string $email): bool { // Default is already taken $alreadyTaken = true; diff --git a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php index a6ad85a7..5c193910 100644 --- a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php +++ b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php @@ -48,7 +48,7 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createPasswordValidatorFilter () { + public static final function createPasswordValidatorFilter (): Filterable { // Get a new instance $filterInstance = new PasswordValidatorFilter(); @@ -64,7 +64,7 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable { * @return void * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get passwords $password1 = $requestInstance->getRequestElement('pass1'); $password2 = $requestInstance->getRequestElement('pass2'); diff --git a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php index 27be04c1..3b250915 100644 --- a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php +++ b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php @@ -50,9 +50,9 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable { /** * Creates an instance of this filter class * - * @return $filterInstance An instance of this filter class + * @return $filterInstance An instance of this filter class */ - public static final function createUserNameValidatorFilter () { + public static final function createUserNameValidatorFilter (): Filterable { // Get a new instance $filterInstance = new UserNameValidatorFilter(); @@ -68,7 +68,7 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable { * @return void * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get username from request $userName = $requestInstance->getRequestElement('username'); @@ -109,7 +109,7 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable { * @param $userName Username to check for existence * @return $alreadyTaken Whether the username has been taken */ - private function ifUserNameIsTaken (string $userName) { + private function ifUserNameIsTaken (string $userName): bool { // Default is already taken $alreadyTaken = true; diff --git a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php index 0d8dfbd5..d3f611a2 100644 --- a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php @@ -52,7 +52,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createAccountPasswordVerifierFilter () { + public static final function createAccountPasswordVerifierFilter (): Filterable { // Get a new instance $filterInstance = new AccountPasswordVerifierFilter(); @@ -70,7 +70,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable { * @throws FilterChainException If this filter fails to operate * @todo Rewrite handling of different password fields */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get password $password = $requestInstance->getRequestElement('pass_old'); diff --git a/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php b/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php index db8ebc21..c8296f48 100644 --- a/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php @@ -47,7 +47,7 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createBirthdayVerifierFilter () { + public static final function createBirthdayVerifierFilter (): Filterable { // Get a new instance $filterInstance = new BirthdayVerifierFilter(); @@ -62,7 +62,7 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Day of birth set? if (!$requestInstance->isRequestElementSet('birth_day')) { // Day of birth isn't set diff --git a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php index 2c4316a7..4490f10b 100644 --- a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php @@ -49,7 +49,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createConfirmCodeVerifierFilter () { + public static final function createConfirmCodeVerifierFilter (): Filterable { // Get a new instance $filterInstance = new ConfirmCodeVerifierFilter(); @@ -65,7 +65,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable { * @return void * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get confirmation code from request $confirmCode = $requestInstance->getRequestElement('confirm'); diff --git a/framework/main/classes/filter/verifier/class_EmailVerifierFilter.php b/framework/main/classes/filter/verifier/class_EmailVerifierFilter.php index 08bb8bee..cf801beb 100644 --- a/framework/main/classes/filter/verifier/class_EmailVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_EmailVerifierFilter.php @@ -48,7 +48,7 @@ class EmailVerifierFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createEmailVerifierFilter () { + public final static function createEmailVerifierFilter (): Filterable { // Get a new instance $filterInstance = new EmailVerifierFilter(); @@ -65,7 +65,7 @@ class EmailVerifierFilter extends BaseFilter implements Filterable { * @throws FilterChainException If this filter fails to operate * @todo 0% done */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Implement this! DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } diff --git a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php index 30936927..e4871e5e 100644 --- a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php @@ -50,7 +50,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl * * @return $filterInstance An instance of this filter class */ - public static final function createGraphicalCodeCaptchaVerifierFilter () { + public static final function createGraphicalCodeCaptchaVerifierFilter (): Filterable { // Get a new instance $filterInstance = new GraphicalCodeCaptchaVerifierFilter(); @@ -66,7 +66,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl * @return void * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Is the form set? if (($requestInstance->getRequestElement('command') !== 'do_form') || (!$requestInstance->isRequestElementSet('form'))) { // Required field not set diff --git a/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php index a4a7870e..e11a2cd7 100644 --- a/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php @@ -48,7 +48,7 @@ class PasswordGuestVerifierFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createPasswordGuestVerifierFilter () { + public static final function createPasswordGuestVerifierFilter (): Filterable { // Get a new instance $filterInstance = new PasswordGuestVerifierFilter(); @@ -64,7 +64,7 @@ class PasswordGuestVerifierFilter extends BaseFilter implements Filterable { * @return void * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get password $password = $requestInstance->getRequestElement('passwd'); diff --git a/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php index 2ab77ca1..bfe9c01d 100644 --- a/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php @@ -47,7 +47,7 @@ class PasswordVerifierFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createPasswordVerifierFilter () { + public static final function createPasswordVerifierFilter (): Filterable { // Get a new instance $filterInstance = new PasswordVerifierFilter(); @@ -63,7 +63,7 @@ class PasswordVerifierFilter extends BaseFilter implements Filterable { * @return void * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get password $password = $requestInstance->getRequestElement('pass'); diff --git a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php index e1f087d5..4a3da1be 100644 --- a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php @@ -51,7 +51,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createUserGuestVerifierFilter () { + public static final function createUserGuestVerifierFilter (): Filterable { // Get a new instance $filterInstance = new UserGuestVerifierFilter(); @@ -67,7 +67,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable { * @return void * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get username from request $userName = $requestInstance->getRequestElement('user'); @@ -111,7 +111,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable { * @param $userName Username to check for existence * @return $alreadyTaken Whether the username has been taken */ - private function ifUserGuestIsTaken (string $userName) { + private function ifUserGuestIsTaken (string $userName): bool { // Default is already taken $alreadyTaken = true; diff --git a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php index cdd08a1a..02485c21 100644 --- a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php @@ -52,7 +52,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createUserNameVerifierFilter () { + public static final function createUserNameVerifierFilter (): Filterable { // Get a new instance $filterInstance = new UserNameVerifierFilter(); @@ -68,7 +68,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable { * @return void * @throws FilterChainException If this filter fails to operate */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get username from request $userName = $requestInstance->getRequestElement('username'); @@ -109,7 +109,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable { * @param $userName Username to check for existence * @return $alreadyTaken Whether the username has been taken */ - private function ifUserNameIsTaken (string $userName) { + private function ifUserNameIsTaken (string $userName): bool { // Default is already taken $alreadyTaken = true; diff --git a/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php index b025f5d0..c94b615d 100644 --- a/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php @@ -48,7 +48,7 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createUserStatusVerifierFilter () { + public static final function createUserStatusVerifierFilter (): Filterable { // Get a new instance $filterInstance = new UserStatusVerifierFilter(); @@ -63,7 +63,7 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get a user instance for comparison $userInstance = ObjectRegistry::getRegistry('generic')->getInstance('user'); diff --git a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php index 46ea0c1f..c358176d 100644 --- a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php @@ -50,7 +50,7 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public static final function createUserUnconfirmedVerifierFilter () { + public static final function createUserUnconfirmedVerifierFilter (): Filterable { // Get a new instance $filterInstance = new UserUnconfirmedVerifierFilter(); @@ -65,7 +65,7 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { + public function execute (Requestable $requestInstance, Responseable $responseInstance): void { // Get a user instance for comparison $userInstance = UserFactory::createUserByRequest($requestInstance); diff --git a/framework/main/classes/handler/tasks/class_TaskHandler.php b/framework/main/classes/handler/tasks/class_TaskHandler.php index 3b23ff2b..34ea5fa3 100644 --- a/framework/main/classes/handler/tasks/class_TaskHandler.php +++ b/framework/main/classes/handler/tasks/class_TaskHandler.php @@ -72,7 +72,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * * @return $handlerInstance An instance of a HandleableTask class */ - public static final function createTaskHandler () { + public static final function createTaskHandler (): HandleableTask { // Get new instance //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('TASK-HANDLER: CALLED!'); $handlerInstance = new TaskHandler(); @@ -109,7 +109,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * @return void * @throws InvalidTaskException If the current task is invalid */ - private function executeCurrentTask () { + private function executeCurrentTask (): void { // Update no task by default //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('TASK-HANDLER: CALLED!'); $updateTask = false; @@ -190,7 +190,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * @param $taskEntry An array with a task * @return void */ - private function updateTask (array $taskEntry) { + private function updateTask (array $taskEntry): void { // Get the key from current iteration //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TASK-HANDLER: taskEntry()=%d - CALLED!', count($taskEntry))); $key = $this->getListInstance()->getIterator()->key(); @@ -213,7 +213,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * @param $taskData Data of the task * @return void */ - private function unregisterTask (array $taskData) { + private function unregisterTask (array $taskData): void { // Remove the entry //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TASK-HANDLER: Removing task %s from queue - CALLED!', $taskData['id'])); $this->getListInstance()->removeEntry('tasks', $taskData); @@ -228,7 +228,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * @param $taskInstanc An instanceof a Taskable class * @return $taskName Name of the task as used while registration */ - public function searchTask (Taskable $taskInstance) { + public function searchTask (Taskable $taskInstance): string { // Default is an empty (not found) task name //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TASK-HANDLER: taskInstance=%s - CALLED!', $taskInstance->__toString())); $taskName = ''; @@ -265,7 +265,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * @throws InvalidArgumentException If a parameter is not valid * @throws UnexpectedValueException If an unexpected value has been configured */ - public function registerTask (string $taskName, Taskable $taskInstance) { + public function registerTask (string $taskName, Taskable $taskInstance): void { // Is the parameter valid //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('TASK-HANDLER: taskName=%s,taskInstance - CALLED!', $taskName, $taskInstance->__toString())); if (empty($taskName)) { @@ -345,7 +345,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * * @return $tasksLeft Whether there are tasks left to handle */ - public function hasTasksLeft () { + public function hasTasksLeft (): bool { // Do we have tasks there? //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('TASK-HANDLER: CALLED!'); $tasksLeft = ($this->getListInstance()->count() > 0); @@ -363,7 +363,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * * @return void */ - public function handleTasks () { + public function handleTasks (): void { // Should we rewind? //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('TASK-HANDLER: CALLED!'); if (!$this->getListInstance()->getIterator()->valid()) { @@ -390,7 +390,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * * @return void */ - public function doShutdown () { + public function doShutdown (): void { // Always rewind to the beginning for next loop //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('TASK-HANDLER: Invoking this->listInstance->iterator->rewind() - CALLED!'); $this->getListInstance()->getIterator()->rewind(); diff --git a/framework/main/classes/registration/class_BaseRegistration.php b/framework/main/classes/registration/class_BaseRegistration.php index 2221eeb6..5f608e6e 100644 --- a/framework/main/classes/registration/class_BaseRegistration.php +++ b/framework/main/classes/registration/class_BaseRegistration.php @@ -57,7 +57,7 @@ abstract class BaseRegistration extends BaseFrameworkSystem { * * @return void */ - protected function initFilterChains () { + protected function initFilterChains (): void { // Pre/post-registration filters $this->preRegistrationFilter = ObjectFactory::createObjectByConfiguredName('filter_chain_class'); $this->postRegistrationFilter = ObjectFactory::createObjectByConfiguredName('filter_chain_class'); @@ -69,7 +69,7 @@ abstract class BaseRegistration extends BaseFrameworkSystem { * @param $filterInstance An instance of a filter * @return void */ - public function addPreFilter (Filterable $filterInstance) { + public function addPreFilter (Filterable $filterInstance): void { // Add the pre filter $this->preRegistrationFilter->addFilter($filterInstance); } @@ -80,7 +80,7 @@ abstract class BaseRegistration extends BaseFrameworkSystem { * @param $filterInstance An instance of a filter * @return void */ - public function addPostFilter (Filterable $filterInstance) { + public function addPostFilter (Filterable $filterInstance): void { // Add the post filter $this->postRegistrationFilter->addFilter($filterInstance); } @@ -90,7 +90,7 @@ abstract class BaseRegistration extends BaseFrameworkSystem { * * @return void */ - protected function executePreFilters () { + protected function executePreFilters (): void { // Execute all pre filters $this->preRegistrationFilter->processFilters(FrameworkBootstrap::getRequestInstance(), FrameworkBootstrap::getResponseInstance()); } @@ -100,7 +100,7 @@ abstract class BaseRegistration extends BaseFrameworkSystem { * * @return void */ - protected function executePostFilters () { + protected function executePostFilters (): void { // Execute all post filters $this->postRegistrationFilter->processFilters(FrameworkBootstrap::getRequestInstance(), FrameworkBootstrap::getResponseInstance()); } diff --git a/framework/main/classes/states/class_BaseState.php b/framework/main/classes/states/class_BaseState.php index ca179953..3df6c4cf 100644 --- a/framework/main/classes/states/class_BaseState.php +++ b/framework/main/classes/states/class_BaseState.php @@ -57,7 +57,7 @@ abstract class BaseState extends BaseFrameworkSystem implements Stateable { * * @return $stateName Name of this state in a printable maner */ - public final function getStateName () { + public final function getStateName (): string { return $this->stateName; } @@ -67,7 +67,7 @@ abstract class BaseState extends BaseFrameworkSystem implements Stateable { * @param $stateName Name of this state in a printable maner * @return void */ - protected final function setStateName (string $stateName) { + protected final function setStateName (string $stateName): void { $this->stateName = $stateName; } @@ -78,7 +78,7 @@ abstract class BaseState extends BaseFrameworkSystem implements Stateable { * @return void * @throws UnsupportedOperationException This method should be overwritten */ - public function executeState (Executor $executorInstance) { + public function executeState (Executor $executorInstance): void { throw new UnsupportedOperationException(array($this, __FUNCTION__, $executorInstance), FrameworkInterface::EXCEPTION_UNSPPORTED_OPERATION); } diff --git a/framework/main/classes/tasks/idle/class_IdleLoopTask.php b/framework/main/classes/tasks/idle/class_IdleLoopTask.php index 60d42fdc..7b844a37 100644 --- a/framework/main/classes/tasks/idle/class_IdleLoopTask.php +++ b/framework/main/classes/tasks/idle/class_IdleLoopTask.php @@ -55,7 +55,7 @@ class IdleLoopTask extends BaseTask implements Taskable, Visitable { * * @return $taskInstance An instance of a Taskable/Visitable class */ - public static final function createIdleLoopTask () { + public static final function createIdleLoopTask (): Taskable { // Get new instance $taskInstance = new IdleLoopTask(); @@ -69,7 +69,7 @@ class IdleLoopTask extends BaseTask implements Taskable, Visitable { * @param $visitorInstance An instance of a Visitor class * @return void */ - public function accept (Visitor $visitorInstance) { + public function accept (Visitor $visitorInstance): void { // Visit this task $visitorInstance->visitTask($this); } @@ -79,7 +79,7 @@ class IdleLoopTask extends BaseTask implements Taskable, Visitable { * * @return void */ - public function executeTask () { + public function executeTask (): void { // Idle here a little $this->idle($this->idleTime); } @@ -89,7 +89,7 @@ class IdleLoopTask extends BaseTask implements Taskable, Visitable { * * @return void */ - public function doShutdown () { + public function doShutdown (): void { // Debug message self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('TASK: Shutting down...'); } diff --git a/framework/main/interfaces/actions/class_PerformableAction.php b/framework/main/interfaces/actions/class_PerformableAction.php index 0795006f..6cb58ce7 100644 --- a/framework/main/interfaces/actions/class_PerformableAction.php +++ b/framework/main/interfaces/actions/class_PerformableAction.php @@ -37,6 +37,6 @@ interface PerformableAction extends FrameworkInterface { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - function execute (Requestable $requestInstance, Responseable $responseInstance); + function execute (Requestable $requestInstance, Responseable $responseInstance): void; } diff --git a/framework/main/interfaces/actions/commands/class_Commandable.php b/framework/main/interfaces/actions/commands/class_Commandable.php index bb8ddfe1..d39ccd6a 100644 --- a/framework/main/interfaces/actions/commands/class_Commandable.php +++ b/framework/main/interfaces/actions/commands/class_Commandable.php @@ -37,7 +37,7 @@ interface Commandable extends PerformableAction { * @param $requestInstance An instance of a class with an Requestable interface * @return void */ - function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance); + function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void; /** * Initializes the template engine @@ -45,6 +45,6 @@ interface Commandable extends PerformableAction { * @param $templateType Type of template, e.g. 'html', 'image', 'console' ... * @return void */ - function initTemplateEngine (string $templateType); + function initTemplateEngine (string $templateType): void; } diff --git a/framework/main/interfaces/discovery/class_Discoverable.php b/framework/main/interfaces/discovery/class_Discoverable.php index 072cffdd..b5ed403f 100644 --- a/framework/main/interfaces/discovery/class_Discoverable.php +++ b/framework/main/interfaces/discovery/class_Discoverable.php @@ -36,7 +36,7 @@ interface Discoverable extends FrameworkInterface { * @param $requestInstance An instance of a Requestable class * @return void */ - function discover (Requestable $requestInstance); + function discover (Requestable $requestInstance): void; /** * Adds the database result in a human-readable format to the helper class @@ -44,6 +44,6 @@ interface Discoverable extends FrameworkInterface { * @param $helperInstance An instance of a helper class * @return void */ - function addResultsToHelper (HelpableTemplate $helperInstance); + function addResultsToHelper (HelpableTemplate $helperInstance): void; } diff --git a/framework/main/interfaces/feature/class_Feature.php b/framework/main/interfaces/feature/class_Feature.php index da2dd219..e1deace0 100644 --- a/framework/main/interfaces/feature/class_Feature.php +++ b/framework/main/interfaces/feature/class_Feature.php @@ -33,6 +33,6 @@ interface Feature extends FrameworkInterface { * * @return $isAvailable Whether this feature is available */ - function isFeatureAvailable (); + function isFeatureAvailable (): bool; } diff --git a/framework/main/interfaces/filter/class_Filterable.php b/framework/main/interfaces/filter/class_Filterable.php index f33dc433..995ad2ed 100644 --- a/framework/main/interfaces/filter/class_Filterable.php +++ b/framework/main/interfaces/filter/class_Filterable.php @@ -37,6 +37,6 @@ interface Filterable extends FrameworkInterface { * @param $responseInstance An instance of a class with an Responseable interface * @return void */ - function execute (Requestable $requestInstance, Responseable $responseInstance); + function execute (Requestable $requestInstance, Responseable $responseInstance): void; } diff --git a/framework/main/interfaces/helper/login/class_HelpableLogin.php b/framework/main/interfaces/helper/login/class_HelpableLogin.php index d3b1382b..1c3ca5fa 100644 --- a/framework/main/interfaces/helper/login/class_HelpableLogin.php +++ b/framework/main/interfaces/helper/login/class_HelpableLogin.php @@ -36,6 +36,6 @@ interface HelpableLogin extends Helper { * @param $responseInstance An instance of a Responseable class * @return void */ - function executeLogin (Responseable $responseInstance); + function executeLogin (Responseable $responseInstance): void; } diff --git a/framework/main/interfaces/tasks/class_Taskable.php b/framework/main/interfaces/tasks/class_Taskable.php index 6efe8f68..0fc3fee5 100644 --- a/framework/main/interfaces/tasks/class_Taskable.php +++ b/framework/main/interfaces/tasks/class_Taskable.php @@ -35,20 +35,20 @@ interface Taskable extends FrameworkInterface { * @param $visitorInstance An instance of a Visitor class * @return void */ - function accept (Visitor $visitorInstance); + function accept (Visitor $visitorInstance): void; /** * Executes the task * * @return void */ - function executeTask (); + function executeTask (): void; /** * Shuts down the task * * @return void */ - function doShutdown (); + function doShutdown (): void; } diff --git a/framework/main/interfaces/template/view/class_ViewHelper.php b/framework/main/interfaces/template/view/class_ViewHelper.php index a01e1d22..b82572c3 100644 --- a/framework/main/interfaces/template/view/class_ViewHelper.php +++ b/framework/main/interfaces/template/view/class_ViewHelper.php @@ -34,6 +34,6 @@ interface ViewHelper extends FrameworkInterface { * @param $args Arguments to send to the view helper * @return mixed Unknown return arguments, or void */ - function execute (array $args = NULL); + function execute (array $args = NULL): mixed; } -- 2.39.5