From e27845b8bbbf6ab70a56e5a364ce2fdd96f833f0 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 23 Feb 2017 22:26:59 +0100 Subject: [PATCH] Continued: - added "import" for Requestable - fixed doc-tags MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../html/class_HtmlLoginProfileAction.php | 1 + .../class_LoginAfterRegistrationAction.php | 3 +++ inc/main/classes/auth/class_CookieAuth.php | 1 - .../classes/class_BaseFrameworkSystem.php | 5 +++-- .../classes/commands/class_BaseCommand.php | 1 + .../console/class_ConsoleFuseCommand.php | 3 +++ .../html/class_HtmlConfirmCommand.php | 1 + .../commands/html/class_HtmlDoFormCommand.php | 3 +++ .../commands/html/class_HtmlHomeCommand.php | 1 + .../html/class_HtmlLoginAreaCommand.php | 1 + .../commands/html/class_HtmlLoginCommand.php | 1 + .../html/class_HtmlLoginFailedCommand.php | 1 + .../commands/html/class_HtmlLogoutCommand.php | 1 + .../html/class_HtmlLogoutDoneCommand.php | 1 + .../html/class_HtmlProblemCommand.php | 3 +++ .../html/class_HtmlRegisterCommand.php | 1 + .../html/class_HtmlResendLinkCommand.php | 1 + .../commands/html/class_HtmlStatusCommand.php | 1 + .../image/class_ImageCodeCaptchaCommand.php | 3 +++ .../controller/class_BaseController.php | 21 ++++++++++--------- .../class_ConsoleDefaultController.php | 7 +++++-- .../class_ConsoleDefaultNewsController.php | 5 +++-- .../html/class_HtmlConfirmController.php | 4 ++-- .../html/class_HtmlDefaultController.php | 7 +++++-- .../html/class_HtmlDefaultNewsController.php | 4 ++-- .../html/class_HtmlLoginController.php | 7 +++++-- .../html/class_HtmlLoginFailedController.php | 7 +++++-- .../html/class_HtmlLogoutController.php | 5 +++-- .../html/class_HtmlLogoutDoneController.php | 7 +++++-- .../html/class_HtmlProblemController.php | 7 +++++-- .../html/class_HtmlRegisterController.php | 4 ++-- .../html/class_HtmlStatusController.php | 7 +++++-- .../html/form/class_HtmlDoFormController.php | 7 +++++-- .../login/class_HtmlLoginAreaController.php | 5 +++-- .../class_ImageCodeCaptchaController.php | 5 +++-- .../image/class_ImageDefaultController.php | 7 +++++-- .../result/class_CachedDatabaseResult.php | 3 +++ .../class_XmlRewriterTemplateDecorator.php | 2 +- .../payment/class_LocalPaymentDiscovery.php | 1 + .../factories/html/class_HtmlNewsFactory.php | 8 ++----- .../factories/login/class_LoginFactory.php | 1 + .../factories/user/class_UserFactory.php | 1 + .../filter/auth/class_UserAuthFilter.php | 1 + .../filter/change/class_EmailChangeFilter.php | 1 + .../change/class_PasswordChangeFilter.php | 1 + .../checkboxes/class_RulesAcceptedFilter.php | 3 +++ .../filter/class_BaseFilterDecorator.php | 9 ++++---- inc/main/classes/filter/class_FilterChain.php | 7 ++++--- .../crypto/class_CaptchaEncryptFilter.php | 1 + .../guest/class_UserNameIsGuestFilter.php | 3 +++ .../filter/news/class_NewsDownloadFilter.php | 1 + .../filter/news/class_NewsProcessFilter.php | 3 +++ .../classes/filter/null/class_NullFilter.php | 3 +++ .../payment/class_PaymentDiscoveryFilter.php | 1 + .../class_UserStatusConfimedUpdateFilter.php | 1 + .../filter/update/class_UserUpdateFilter.php | 1 + .../validator/class_EmailValidatorFilter.php | 1 + .../class_PasswordValidatorFilter.php | 5 ++++- .../class_UserNameValidatorFilter.php | 1 + .../class_AccountPasswordVerifierFilter.php | 1 + .../verifier/class_BirthdayVerifierFilter.php | 3 +++ .../class_ConfirmCodeVerifierFilter.php | 1 + ...ass_GraphicalCodeCaptchaVerifierFilter.php | 1 + .../class_PasswordGuestVerifierFilter.php | 3 +++ .../verifier/class_PasswordVerifierFilter.php | 3 +++ .../class_UserGuestVerifierFilter.php | 1 + .../verifier/class_UserNameVerifierFilter.php | 1 + .../class_UserStatusVerifierFilter.php | 1 + .../class_UserUnconfirmedVerifierFilter.php | 1 + inc/main/classes/points/class_UserPoints.php | 2 ++ .../reader/class_ConsoleNewsReader.php | 1 + .../reader/class_DefaultNewsReader.php | 1 + .../request/console/class_ConsoleRequest.php | 3 +++ .../request/html/class_HtmlRequest.php | 3 +++ .../action/html/class_HtmlActionResolver.php | 3 ++- .../command/class_BaseCommandResolver.php | 3 ++- .../template/class_BaseTemplateEngine.php | 2 +- inc/main/classes/user/class_BaseUser.php | 3 ++- inc/main/classes/user/guest/class_Guest.php | 1 + .../actions/class_PerformableAction.php | 1 + .../actions/commands/class_Commandable.php | 3 +++ .../controller/class_Controller.php | 5 +++-- .../extended/class_AddableCriteria.php | 1 + .../discovery/class_Discoverable.php | 1 + .../interfaces/filter/class_Filterable.php | 1 + .../interfaces/login/class_LoginableUser.php | 1 + .../resolver/actions/class_ActionResolver.php | 5 ++++- .../commands/class_CommandResolver.php | 5 ++++- .../template/class_CompileableTemplate.php | 2 +- .../user/class_ManageableAccount.php | 3 ++- 90 files changed, 204 insertions(+), 70 deletions(-) diff --git a/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php b/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php index e53e3ea1..2617c9e0 100644 --- a/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php +++ b/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php @@ -5,6 +5,7 @@ namespace CoreFramework\Action\Login; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Registerable; +use CoreFramework\Request\Requestable; /** * An action for the profile page in login area diff --git a/inc/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php b/inc/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php index 93eaf14f..ed1f3212 100644 --- a/inc/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php +++ b/inc/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Action\PostRegistration\Login; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A post registration action to login after the registration is done * diff --git a/inc/main/classes/auth/class_CookieAuth.php b/inc/main/classes/auth/class_CookieAuth.php index e08bb33b..b25213ae 100644 --- a/inc/main/classes/auth/class_CookieAuth.php +++ b/inc/main/classes/auth/class_CookieAuth.php @@ -116,7 +116,6 @@ class CookieAuth extends BaseFrameworkSystem implements Authorizeable, Registera /** * Updates the authorization data and/or sets additional tracking data * - * @param $requestInstance An instance of a Requestable class * @return void */ public function updateAuthData () { diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php index f5e05104..c09e84a4 100644 --- a/inc/main/classes/class_BaseFrameworkSystem.php +++ b/inc/main/classes/class_BaseFrameworkSystem.php @@ -12,6 +12,7 @@ use CoreFramework\Manager\ManageableApplication; use CoreFramework\Middleware\Debug\DebugMiddleware; use CoreFramework\Registry\Register; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; use CoreFramework\Stream\Output\OutputStreamer; use CoreFramework\Template\CompileableTemplate; @@ -53,12 +54,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { private $realClass = 'BaseFrameworkSystem'; /** - * Instance of a request class + * Instance of a Requestable class */ private $requestInstance = NULL; /** - * Instance of a response class + * Instance of a Responsable class */ private $responseInstance = NULL; diff --git a/inc/main/classes/commands/class_BaseCommand.php b/inc/main/classes/commands/class_BaseCommand.php index 7c09754c..b2bb4c6d 100644 --- a/inc/main/classes/commands/class_BaseCommand.php +++ b/inc/main/classes/commands/class_BaseCommand.php @@ -5,6 +5,7 @@ namespace CoreFramework\Command; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Object\BaseFrameworkSystem; +use CoreFramework\Request\Requestable; /** * A general (base) command diff --git a/inc/main/classes/commands/console/class_ConsoleFuseCommand.php b/inc/main/classes/commands/console/class_ConsoleFuseCommand.php index 01fd5236..9a5a6ddb 100644 --- a/inc/main/classes/commands/console/class_ConsoleFuseCommand.php +++ b/inc/main/classes/commands/console/class_ConsoleFuseCommand.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Command\Fuse; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A Fuse console command * diff --git a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php index 3109fb1c..a732e0c3 100644 --- a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php +++ b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php @@ -6,6 +6,7 @@ namespace CoreFramework\Command\Guest; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Generic\NullPointerException; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A command for the confirmation link handling diff --git a/inc/main/classes/commands/html/class_HtmlDoFormCommand.php b/inc/main/classes/commands/html/class_HtmlDoFormCommand.php index e5fd4e18..a7f89d38 100644 --- a/inc/main/classes/commands/html/class_HtmlDoFormCommand.php +++ b/inc/main/classes/commands/html/class_HtmlDoFormCommand.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Command\Form; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A command for the form processor * diff --git a/inc/main/classes/commands/html/class_HtmlHomeCommand.php b/inc/main/classes/commands/html/class_HtmlHomeCommand.php index cddd93c9..9717ad01 100644 --- a/inc/main/classes/commands/html/class_HtmlHomeCommand.php +++ b/inc/main/classes/commands/html/class_HtmlHomeCommand.php @@ -4,6 +4,7 @@ namespace CoreFramework\Command\Guest; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * A command for the home page diff --git a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php index fb328a50..27be3a40 100644 --- a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php +++ b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php @@ -5,6 +5,7 @@ namespace CoreFramework\Command\Login; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A command for the login area (member/gamer area) diff --git a/inc/main/classes/commands/html/class_HtmlLoginCommand.php b/inc/main/classes/commands/html/class_HtmlLoginCommand.php index 8b8f18a1..5a025310 100644 --- a/inc/main/classes/commands/html/class_HtmlLoginCommand.php +++ b/inc/main/classes/commands/html/class_HtmlLoginCommand.php @@ -6,6 +6,7 @@ namespace CoreFramework\Command\Login; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Registerable; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A command for the login form diff --git a/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php b/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php index 8280940c..74530ec4 100644 --- a/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php +++ b/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php @@ -4,6 +4,7 @@ namespace CoreFramework\Command\Failed; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * A command for the login failed page diff --git a/inc/main/classes/commands/html/class_HtmlLogoutCommand.php b/inc/main/classes/commands/html/class_HtmlLogoutCommand.php index 9a42eba4..df0a7ba1 100644 --- a/inc/main/classes/commands/html/class_HtmlLogoutCommand.php +++ b/inc/main/classes/commands/html/class_HtmlLogoutCommand.php @@ -4,6 +4,7 @@ namespace CoreFramework\Command\Login; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * A command for logout diff --git a/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php b/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php index d1a4bd91..d0211b31 100644 --- a/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php +++ b/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php @@ -4,6 +4,7 @@ namespace CoreFramework\Command\Logout; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * A command for the login failed page diff --git a/inc/main/classes/commands/html/class_HtmlProblemCommand.php b/inc/main/classes/commands/html/class_HtmlProblemCommand.php index 562d1429..c452c2f7 100644 --- a/inc/main/classes/commands/html/class_HtmlProblemCommand.php +++ b/inc/main/classes/commands/html/class_HtmlProblemCommand.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Command\Failed; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A command for Problem page * diff --git a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php index f473a35e..676b48a1 100644 --- a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php +++ b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php @@ -6,6 +6,7 @@ namespace CoreFramework\Command\Register; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Registerable; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A command class for the registration form diff --git a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php index 618d344c..860d91fe 100644 --- a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php +++ b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php @@ -5,6 +5,7 @@ namespace CoreFramework\Command\Guest; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A command class for resending the confirmation link diff --git a/inc/main/classes/commands/html/class_HtmlStatusCommand.php b/inc/main/classes/commands/html/class_HtmlStatusCommand.php index 13d49f5c..7dc96224 100644 --- a/inc/main/classes/commands/html/class_HtmlStatusCommand.php +++ b/inc/main/classes/commands/html/class_HtmlStatusCommand.php @@ -4,6 +4,7 @@ namespace CoreFramework\Command\Status; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * A command for Status page diff --git a/inc/main/classes/commands/image/class_ImageCodeCaptchaCommand.php b/inc/main/classes/commands/image/class_ImageCodeCaptchaCommand.php index c8f45222..63146441 100644 --- a/inc/main/classes/commands/image/class_ImageCodeCaptchaCommand.php +++ b/inc/main/classes/commands/image/class_ImageCodeCaptchaCommand.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Command\Captcha; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A command for creating code CAPTCHAs * diff --git a/inc/main/classes/controller/class_BaseController.php b/inc/main/classes/controller/class_BaseController.php index bc257a7b..e1215a5a 100644 --- a/inc/main/classes/controller/class_BaseController.php +++ b/inc/main/classes/controller/class_BaseController.php @@ -7,6 +7,7 @@ use CoreFramework\Factory\ObjectFactory; use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Generic\Registry; use CoreFramework\Registry\Registerable; +use CoreFramework\Request\Requestable; /** * A generic controller class. You should extend this base class if you want to @@ -97,8 +98,8 @@ class BaseController extends BaseFrameworkSystem implements Registerable { * Handles the given request and response, redirects to login_failed if * UserAuthorizationException is thrown. * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function genericHanleRequestLoginFailedRedirect (Requestable $requestInstance, Responseable $responseInstance) { @@ -143,8 +144,8 @@ class BaseController extends BaseFrameworkSystem implements Registerable { * Generic execute of the command: pre and post filters with redirect * but request becomes valid after pre-filters run. * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function genericHanleRequestLoginAreaFailedRedirect (Requestable $requestInstance, Responseable $responseInstance) { @@ -249,8 +250,8 @@ class BaseController extends BaseFrameworkSystem implements Registerable { * Executes given filter chain chain * * @param $filterChain Chain of the filter to execute - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void * @throws InvalidFilterChainException If the filter chain is invalid */ @@ -268,8 +269,8 @@ class BaseController extends BaseFrameworkSystem implements Registerable { /** * Executes all pre filters * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ protected function executePreFilters (Requestable $requestInstance, Responseable $responseInstance) { @@ -280,8 +281,8 @@ class BaseController extends BaseFrameworkSystem implements Registerable { /** * Executes all post filters * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ protected function executePostFilters (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/console/class_ConsoleDefaultController.php b/inc/main/classes/controller/console/class_ConsoleDefaultController.php index bcb09fe7..cefd947a 100644 --- a/inc/main/classes/controller/console/class_ConsoleDefaultController.php +++ b/inc/main/classes/controller/console/class_ConsoleDefaultController.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Controller\Default; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * The default controller for all other console requests * @@ -56,8 +59,8 @@ class ConsoleDefaultController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responseable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php b/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php index aacb75b0..dbb630fe 100644 --- a/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php +++ b/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php @@ -4,6 +4,7 @@ namespace CoreFramework\Controller\Default; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * The default controller with news for e.g. home or news page @@ -62,8 +63,8 @@ class ConsoleDefaultNewsController extends BaseController implements Controller /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responseable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/class_HtmlConfirmController.php b/inc/main/classes/controller/html/class_HtmlConfirmController.php index d79d53f8..3dbe58b3 100644 --- a/inc/main/classes/controller/html/class_HtmlConfirmController.php +++ b/inc/main/classes/controller/html/class_HtmlConfirmController.php @@ -65,8 +65,8 @@ class HtmlConfirmController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/class_HtmlDefaultController.php b/inc/main/classes/controller/html/class_HtmlDefaultController.php index 29078e48..6e72f362 100644 --- a/inc/main/classes/controller/html/class_HtmlDefaultController.php +++ b/inc/main/classes/controller/html/class_HtmlDefaultController.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Controller\Default; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * The default controller for all other web requests * @@ -56,8 +59,8 @@ class HtmlDefaultController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php b/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php index 4785f121..81d672ec 100644 --- a/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php +++ b/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php @@ -62,8 +62,8 @@ class HtmlDefaultNewsController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/class_HtmlLoginController.php b/inc/main/classes/controller/html/class_HtmlLoginController.php index e8188464..076a328c 100644 --- a/inc/main/classes/controller/html/class_HtmlLoginController.php +++ b/inc/main/classes/controller/html/class_HtmlLoginController.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Controller\Login; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * Controller for login form with password reminder and maybe enabled * "guest-login" button @@ -57,8 +60,8 @@ class HtmlLoginController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/class_HtmlLoginFailedController.php b/inc/main/classes/controller/html/class_HtmlLoginFailedController.php index b20e079d..d110d369 100644 --- a/inc/main/classes/controller/html/class_HtmlLoginFailedController.php +++ b/inc/main/classes/controller/html/class_HtmlLoginFailedController.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Controller\Failed; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A controller for login failed page * @@ -55,8 +58,8 @@ class HtmlLoginFailedController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/class_HtmlLogoutController.php b/inc/main/classes/controller/html/class_HtmlLogoutController.php index 8ebcf1bb..412e6206 100644 --- a/inc/main/classes/controller/html/class_HtmlLogoutController.php +++ b/inc/main/classes/controller/html/class_HtmlLogoutController.php @@ -4,6 +4,7 @@ namespace CoreFramework\Controller\Logout; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * The default controller for logout page @@ -65,8 +66,8 @@ class HtmlLogoutController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php b/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php index a6092c73..5c1dbdf5 100644 --- a/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php +++ b/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Controller\Logout; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * Controller for logout done page * @@ -56,8 +59,8 @@ class HtmlLogoutDoneController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/class_HtmlProblemController.php b/inc/main/classes/controller/html/class_HtmlProblemController.php index 7114710d..65fcd4ad 100644 --- a/inc/main/classes/controller/html/class_HtmlProblemController.php +++ b/inc/main/classes/controller/html/class_HtmlProblemController.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Controller\Problem; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * Controller for problem requests * @@ -56,8 +59,8 @@ class HtmlProblemController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/class_HtmlRegisterController.php b/inc/main/classes/controller/html/class_HtmlRegisterController.php index 1ed3ca6a..9f19210e 100644 --- a/inc/main/classes/controller/html/class_HtmlRegisterController.php +++ b/inc/main/classes/controller/html/class_HtmlRegisterController.php @@ -53,8 +53,8 @@ class HtmlRegisterController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/class_HtmlStatusController.php b/inc/main/classes/controller/html/class_HtmlStatusController.php index 1b173b2e..e5e1cb29 100644 --- a/inc/main/classes/controller/html/class_HtmlStatusController.php +++ b/inc/main/classes/controller/html/class_HtmlStatusController.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Controller\Status; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * Controller for changing user status * @@ -56,8 +59,8 @@ class HtmlStatusController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/form/class_HtmlDoFormController.php b/inc/main/classes/controller/html/form/class_HtmlDoFormController.php index e7c816d5..ccef17bc 100644 --- a/inc/main/classes/controller/html/form/class_HtmlDoFormController.php +++ b/inc/main/classes/controller/html/form/class_HtmlDoFormController.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Controller\Form; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A controller for handling sent forms * @@ -58,8 +61,8 @@ class HtmlDoFormController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php b/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php index 9ce112da..0bab0101 100644 --- a/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php +++ b/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php @@ -4,6 +4,7 @@ namespace CoreFramework\Controller\Login; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * Controller for login area with news @@ -71,8 +72,8 @@ class HtmlLoginAreaController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php b/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php index ece8e712..9abb1867 100644 --- a/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php +++ b/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php @@ -4,6 +4,7 @@ namespace CoreFramework\Controller\Image\Captcha; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * A controller for a code-based CAPTCHA where the user has to repeat a shown code @@ -61,8 +62,8 @@ class ImageCodeCaptchaController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/controller/image/class_ImageDefaultController.php b/inc/main/classes/controller/image/class_ImageDefaultController.php index 63b78338..b7c831a6 100644 --- a/inc/main/classes/controller/image/class_ImageDefaultController.php +++ b/inc/main/classes/controller/image/class_ImageDefaultController.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Controller\Default; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A default controller for images * @@ -55,8 +58,8 @@ class ImageDefaultController extends BaseController implements Controller { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responseable class * @return void */ public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/database/result/class_CachedDatabaseResult.php b/inc/main/classes/database/result/class_CachedDatabaseResult.php index 4e2bfc9b..4489c44b 100644 --- a/inc/main/classes/database/result/class_CachedDatabaseResult.php +++ b/inc/main/classes/database/result/class_CachedDatabaseResult.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Database\Result; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A database result class * diff --git a/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php b/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php index 9b8221a3..72d33a23 100644 --- a/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php +++ b/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php @@ -262,7 +262,7 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableT /** * Transfers the content of this template engine to a given response instance * - * @param $responseInstance An instance of a response class + * @param $responseInstance An instance of a Responsable class * @return void */ public function transferToResponse (Responseable $responseInstance) { diff --git a/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php b/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php index 88814f55..d81219f5 100644 --- a/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php +++ b/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php @@ -5,6 +5,7 @@ namespace CoreFramework\Discovery\Payment; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Registerable; +use CoreFramework\Request\Requestable; /** * A local payment discovery class. This class looks in local database for diff --git a/inc/main/classes/factories/html/class_HtmlNewsFactory.php b/inc/main/classes/factories/html/class_HtmlNewsFactory.php index 40051339..ce86ac75 100644 --- a/inc/main/classes/factories/html/class_HtmlNewsFactory.php +++ b/inc/main/classes/factories/html/class_HtmlNewsFactory.php @@ -4,6 +4,7 @@ namespace CoreFramework\Factory\News; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * A news factory for web pages @@ -28,11 +29,6 @@ use CoreFramework\Factory\ObjectFactory; * along with this program. If not, see . */ class HtmlNewsFactory extends BaseFactory { - /** - * Instance of a request class - */ - private $requestInstance = NULL; - /** * Protected constructor * @@ -47,7 +43,7 @@ class HtmlNewsFactory extends BaseFactory { * Singleton getter for a special factory instance depending on the given * request * - * @param $requestInstance An instance of a request class + * @param $requestInstance An instance of a Requestable class * @return $factoryInstance An instance of a HtmlNewsFactory class */ public static final function createFactoryByRequest (Requestable $requestInstance) { diff --git a/inc/main/classes/factories/login/class_LoginFactory.php b/inc/main/classes/factories/login/class_LoginFactory.php index 906f9b2f..bc056503 100644 --- a/inc/main/classes/factories/login/class_LoginFactory.php +++ b/inc/main/classes/factories/login/class_LoginFactory.php @@ -5,6 +5,7 @@ namespace CoreFramework\Factory\Login; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A factory class for socket registries diff --git a/inc/main/classes/factories/user/class_UserFactory.php b/inc/main/classes/factories/user/class_UserFactory.php index 89baee3d..8abdd293 100644 --- a/inc/main/classes/factories/user/class_UserFactory.php +++ b/inc/main/classes/factories/user/class_UserFactory.php @@ -6,6 +6,7 @@ namespace CoreFramework\Factory\User; use CoreFramework\Configuration\FrameworkConfiguration; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A factory class for socket registries diff --git a/inc/main/classes/filter/auth/class_UserAuthFilter.php b/inc/main/classes/filter/auth/class_UserAuthFilter.php index 8f60b855..d7935563 100644 --- a/inc/main/classes/filter/auth/class_UserAuthFilter.php +++ b/inc/main/classes/filter/auth/class_UserAuthFilter.php @@ -5,6 +5,7 @@ namespace CoreFramework\Filter\User\Auth; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A filter for checking user permissions diff --git a/inc/main/classes/filter/change/class_EmailChangeFilter.php b/inc/main/classes/filter/change/class_EmailChangeFilter.php index f99581c6..cc020834 100644 --- a/inc/main/classes/filter/change/class_EmailChangeFilter.php +++ b/inc/main/classes/filter/change/class_EmailChangeFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Change\Email; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A filter for detecting email changes diff --git a/inc/main/classes/filter/change/class_PasswordChangeFilter.php b/inc/main/classes/filter/change/class_PasswordChangeFilter.php index 900eaf4b..b260541b 100644 --- a/inc/main/classes/filter/change/class_PasswordChangeFilter.php +++ b/inc/main/classes/filter/change/class_PasswordChangeFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Change\Email; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A filter for password change detection diff --git a/inc/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php b/inc/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php index 1a0729e2..3224e4f0 100644 --- a/inc/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php +++ b/inc/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\RulesCheckbox; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A filter for checking if the user has accepted the rules. This is mainly * used and done in registration process and should not be removed from your diff --git a/inc/main/classes/filter/class_BaseFilterDecorator.php b/inc/main/classes/filter/class_BaseFilterDecorator.php index 68f50d0b..c25c8f66 100644 --- a/inc/main/classes/filter/class_BaseFilterDecorator.php +++ b/inc/main/classes/filter/class_BaseFilterDecorator.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter; // Import framework stuff use CoreFramework\Object\BaseFrameworkSystem; +use CoreFramework\Request\Requestable; /** * A general filter decorator for decorating filters with other filters @@ -66,8 +67,8 @@ abstract class BaseFilterDecorator extends BaseFrameworkSystem implements Filter /** * Execute the inner filter * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ public final function execute (Requestable $requestInstance, Responseable $responseInstance) { @@ -78,8 +79,8 @@ abstract class BaseFilterDecorator extends BaseFrameworkSystem implements Filter /** * Do the execution of the filter * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responsable class * @return void */ abstract public function doExecute (Requestable $requestInstance, Responseable $responseInstance); diff --git a/inc/main/classes/filter/class_FilterChain.php b/inc/main/classes/filter/class_FilterChain.php index de1e0da0..1d88e020 100644 --- a/inc/main/classes/filter/class_FilterChain.php +++ b/inc/main/classes/filter/class_FilterChain.php @@ -3,8 +3,9 @@ namespace CoreFramework\Filter\Chain; // Import framework stuff -use use CoreFramework\Registry\Registerable; use CoreFramework\Object\BaseFrameworkSystem; +use CoreFramework\Registry\Registerable; +use CoreFramework\Request\Requestable; /** * A filter chain for pre and post filters @@ -114,8 +115,8 @@ class FilterChain extends BaseFrameworkSystem implements Registerable { * Process all added filters. Please note that filters must throw * FilterChainException if they need to interrupt the filter chain. * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responseable class * @return void */ public function processFilters (Requestable $requestInstance, Responseable $responseInstance) { diff --git a/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php b/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php index de8ac42c..c4cc9f9e 100644 --- a/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php +++ b/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Captcha; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * A filter for checking if value "encrypt" is set and fine diff --git a/inc/main/classes/filter/guest/class_UserNameIsGuestFilter.php b/inc/main/classes/filter/guest/class_UserNameIsGuestFilter.php index 6e75e146..1cdccc93 100644 --- a/inc/main/classes/filter/guest/class_UserNameIsGuestFilter.php +++ b/inc/main/classes/filter/guest/class_UserNameIsGuestFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\User\Username; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A filter for checking if username "guest" has been choosen as configured. If * so the password will be set to the configured password. diff --git a/inc/main/classes/filter/news/class_NewsDownloadFilter.php b/inc/main/classes/filter/news/class_NewsDownloadFilter.php index b0a5bf52..f9e4dc28 100644 --- a/inc/main/classes/filter/news/class_NewsDownloadFilter.php +++ b/inc/main/classes/filter/news/class_NewsDownloadFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\News; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A pre-filter for downloading news from a source. This can be a XML feed or diff --git a/inc/main/classes/filter/news/class_NewsProcessFilter.php b/inc/main/classes/filter/news/class_NewsProcessFilter.php index ace93413..7548a5c6 100644 --- a/inc/main/classes/filter/news/class_NewsProcessFilter.php +++ b/inc/main/classes/filter/news/class_NewsProcessFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\News; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A post-filter for processing downloaded news. This will prepare the news fir * output to the template engine. diff --git a/inc/main/classes/filter/null/class_NullFilter.php b/inc/main/classes/filter/null/class_NullFilter.php index 2228c6d3..bafd97be 100644 --- a/inc/main/classes/filter/null/class_NullFilter.php +++ b/inc/main/classes/filter/null/class_NullFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Generic; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * As the name said: A null filter does just pass through the data. This is * useful to make other filters switch on/off-able. diff --git a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php index ce5ee9de..566f78a7 100644 --- a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php +++ b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php @@ -6,6 +6,7 @@ namespace CoreFramework\Filter\Discovery\Payment; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Generic\NullPointerException; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A filter for payment discovery. This class discovers the payment type and diff --git a/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php index 990ed315..75c4d7c2 100644 --- a/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php +++ b/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\User\Status; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A filter for updating the user account status to confirmed diff --git a/inc/main/classes/filter/update/class_UserUpdateFilter.php b/inc/main/classes/filter/update/class_UserUpdateFilter.php index 0be46b6c..2fc5538c 100644 --- a/inc/main/classes/filter/update/class_UserUpdateFilter.php +++ b/inc/main/classes/filter/update/class_UserUpdateFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\User; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A filter for updating the user account like last activity, last action diff --git a/inc/main/classes/filter/validator/class_EmailValidatorFilter.php b/inc/main/classes/filter/validator/class_EmailValidatorFilter.php index 66cea191..6380195b 100644 --- a/inc/main/classes/filter/validator/class_EmailValidatorFilter.php +++ b/inc/main/classes/filter/validator/class_EmailValidatorFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Validator\Email; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A concrete filter for validating the email address. This filter may intercept diff --git a/inc/main/classes/filter/validator/class_PasswordValidatorFilter.php b/inc/main/classes/filter/validator/class_PasswordValidatorFilter.php index bf0bf85a..11922c97 100644 --- a/inc/main/classes/filter/validator/class_PasswordValidatorFilter.php +++ b/inc/main/classes/filter/validator/class_PasswordValidatorFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Validator\Password; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A concrete filter for validating the password. This filter may intercept * the filter chain if no password is given or if both passwords didn't match. @@ -39,7 +42,7 @@ class PasswordValidatorFilter 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 createPasswordValidatorFilter () { // Get a new instance diff --git a/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php b/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php index 2afbfc6b..a3bcfb48 100644 --- a/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php +++ b/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Validator\Username; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A concrete filter for validating the username. This filter may intercept the diff --git a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php index 164ff944..abdaf5da 100644 --- a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php @@ -5,6 +5,7 @@ namespace CoreFramework\Filter\Verifier\Password; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A concrete filter for validating the password. This filter may intercept diff --git a/inc/main/classes/filter/verifier/class_BirthdayVerifierFilter.php b/inc/main/classes/filter/verifier/class_BirthdayVerifierFilter.php index 1b1c73c4..6c06a88f 100644 --- a/inc/main/classes/filter/verifier/class_BirthdayVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_BirthdayVerifierFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Verifier\User; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A verifier filter for birthday data * diff --git a/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php index 17760433..a21eb0b2 100644 --- a/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Verifier\Confirmation; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A filter for checking if supplied confirmation code is valid. diff --git a/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php index 05b133bd..871bbc51 100644 --- a/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Verifier\Captcha; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * A concrete filter for validating code graphical CAPTCHAs with hashes diff --git a/inc/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php b/inc/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php index 1f9060a3..a464ff0f 100644 --- a/inc/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Verifier\User; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A concrete filter for validating the guest password. This filter may intercept * the filter chain if no password is given or the password is invalid diff --git a/inc/main/classes/filter/verifier/class_PasswordVerifierFilter.php b/inc/main/classes/filter/verifier/class_PasswordVerifierFilter.php index 66714a24..86bac5f1 100644 --- a/inc/main/classes/filter/verifier/class_PasswordVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_PasswordVerifierFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Verifier\Password; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A concrete filter for validating the password. This filter may intercept * the filter chain if no password is given or the password is invalid diff --git a/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php index 5fba45f8..6ac47951 100644 --- a/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Verifier\User; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A concrete filter for verfying the guest username. This filter may intercept the diff --git a/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php index 7d748c62..9e018e65 100644 --- a/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Verifier\User; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A concrete filter for verfying the username. This filter may intercept the diff --git a/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php index 4a10efce..07021944 100644 --- a/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Verifier\User; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A filter for checking if user status is GUEST or CONFIRMED. diff --git a/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php index 3c4db3c5..a78ec10b 100644 --- a/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter\Verifier\User; // Import framework stuff use CoreFramework\Registry\Generic\Registry; +use CoreFramework\Request\Requestable; /** * A filter for checking if user status is UNCONFIRMED. diff --git a/inc/main/classes/points/class_UserPoints.php b/inc/main/classes/points/class_UserPoints.php index ce28dabb..87d7a699 100644 --- a/inc/main/classes/points/class_UserPoints.php +++ b/inc/main/classes/points/class_UserPoints.php @@ -6,6 +6,7 @@ namespace CoreFramework\User\Point; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Registerable; +use CoreFramework\Request\Requestable; /** * A class for handling user points which can be real or Internet currency @@ -177,6 +178,7 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo * @param $criteriaInstance An instance of a StoreableCriteria class * @param $requestInstance An instance of a Requestable class * @return void + * @todo $requestInstance is currently unused */ public function addElementsToDataSet (StoreableCriteria $criteriaInstance, Requestable $requestInstance = NULL) { // Add user id diff --git a/inc/main/classes/reader/class_ConsoleNewsReader.php b/inc/main/classes/reader/class_ConsoleNewsReader.php index f868002a..cac28360 100644 --- a/inc/main/classes/reader/class_ConsoleNewsReader.php +++ b/inc/main/classes/reader/class_ConsoleNewsReader.php @@ -6,6 +6,7 @@ namespace CoreFramework\Reader\News; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Registerable; +use CoreFramework\Request\Requestable; /** * A console news reader class reads news from database layer diff --git a/inc/main/classes/reader/class_DefaultNewsReader.php b/inc/main/classes/reader/class_DefaultNewsReader.php index 4173d84a..4630820d 100644 --- a/inc/main/classes/reader/class_DefaultNewsReader.php +++ b/inc/main/classes/reader/class_DefaultNewsReader.php @@ -6,6 +6,7 @@ namespace CoreFramework\Reader\News; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Registerable; +use CoreFramework\Request\Requestable; /** * A default news reader class reads news from database layer diff --git a/inc/main/classes/request/console/class_ConsoleRequest.php b/inc/main/classes/request/console/class_ConsoleRequest.php index dbd81edf..af8f3758 100644 --- a/inc/main/classes/request/console/class_ConsoleRequest.php +++ b/inc/main/classes/request/console/class_ConsoleRequest.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Request; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A concrete request class * diff --git a/inc/main/classes/request/html/class_HtmlRequest.php b/inc/main/classes/request/html/class_HtmlRequest.php index dd2c301a..db025f0d 100644 --- a/inc/main/classes/request/html/class_HtmlRequest.php +++ b/inc/main/classes/request/html/class_HtmlRequest.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Request; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * A concrete and secured HTML request class to make HTML requests more abstract * diff --git a/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php b/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php index 9c9afc72..d938767c 100644 --- a/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php +++ b/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php @@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Action; // Import framework stuff use CoreFramework\Manager\ManageableApplication; +use CoreFramework\Request\Requestable; /** * A action resolver for local (non-hubbed) actions @@ -79,7 +80,7 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver { * Returns an action instance for a given request class or null if * it was not found * - * @param $requestInstance An instance of a request class + * @param $requestInstance An instance of a Requestable class * @return $actionInstance An instance of the resolved action * @throws InvalidActionException Thrown if $actionName is * invalid diff --git a/inc/main/classes/resolver/command/class_BaseCommandResolver.php b/inc/main/classes/resolver/command/class_BaseCommandResolver.php index 4e91fde1..e538a8c4 100644 --- a/inc/main/classes/resolver/command/class_BaseCommandResolver.php +++ b/inc/main/classes/resolver/command/class_BaseCommandResolver.php @@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Controller; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Request\Requestable; /** * A generic command resolver class @@ -74,7 +75,7 @@ class BaseCommandResolver extends BaseResolver { * Returns an command instance for a given request class or null if * it was not found * - * @param $requestInstance An instance of a request class + * @param $requestInstance An instance of a Requestable class * @return $commandInstance An instance of the resolved command * @throws InvalidCommandException Thrown if $commandName is * invalid diff --git a/inc/main/classes/template/class_BaseTemplateEngine.php b/inc/main/classes/template/class_BaseTemplateEngine.php index a20fa8c6..ef1fa359 100644 --- a/inc/main/classes/template/class_BaseTemplateEngine.php +++ b/inc/main/classes/template/class_BaseTemplateEngine.php @@ -1459,7 +1459,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { /** * Transfers the content of this template engine to a given response instance * - * @param $responseInstance An instance of a response class + * @param $responseInstance An instance of a Responsable class * @return void */ public function transferToResponse (Responseable $responseInstance) { diff --git a/inc/main/classes/user/class_BaseUser.php b/inc/main/classes/user/class_BaseUser.php index e6f767ea..f4732f21 100644 --- a/inc/main/classes/user/class_BaseUser.php +++ b/inc/main/classes/user/class_BaseUser.php @@ -5,6 +5,7 @@ namespace CoreFramework\User; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Object\BaseFrameworkSystem; +use CoreFramework\Request\Requestable; /** * A general user class @@ -220,7 +221,7 @@ class BaseUser extends BaseFrameworkSystem implements Updateable { * Checks if supplied password hash in request matches with the stored in * database. * - * @param $requestInstance A requestable class instance + * @param $requestInstance A Requestable class instance * @return $matches Whether the supplied password hash matches */ public function ifPasswordHashMatches (Requestable $requestInstance) { diff --git a/inc/main/classes/user/guest/class_Guest.php b/inc/main/classes/user/guest/class_Guest.php index eba42dac..91a788ee 100644 --- a/inc/main/classes/user/guest/class_Guest.php +++ b/inc/main/classes/user/guest/class_Guest.php @@ -4,6 +4,7 @@ namespace CoreFramework\User\Guest; // Import framework stuff use CoreFramework\Registry\Registerable; +use CoreFramework\Request\Requestable; /** * A generic class for handling guests diff --git a/inc/main/interfaces/actions/class_PerformableAction.php b/inc/main/interfaces/actions/class_PerformableAction.php index 39e96a87..10ecd3aa 100644 --- a/inc/main/interfaces/actions/class_PerformableAction.php +++ b/inc/main/interfaces/actions/class_PerformableAction.php @@ -4,6 +4,7 @@ namespace CoreFramework\Action; // Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Request\Requestable; /** * An interface for performable actions diff --git a/inc/main/interfaces/actions/commands/class_Commandable.php b/inc/main/interfaces/actions/commands/class_Commandable.php index ea636ff6..2b62566d 100644 --- a/inc/main/interfaces/actions/commands/class_Commandable.php +++ b/inc/main/interfaces/actions/commands/class_Commandable.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Command; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * An interface for commands for the front controller * diff --git a/inc/main/interfaces/controller/class_Controller.php b/inc/main/interfaces/controller/class_Controller.php index 75bcc658..1472c929 100644 --- a/inc/main/interfaces/controller/class_Controller.php +++ b/inc/main/interfaces/controller/class_Controller.php @@ -4,6 +4,7 @@ namespace CoreFramework\Controller; // Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Request\Requestable; /** * An interface for controller @@ -31,8 +32,8 @@ interface Controller extends FrameworkInterface { /** * Handles the given request and response * - * @param $requestInstance An instance of a request class - * @param $responseInstance An instance of a response class + * @param $requestInstance An instance of a Requestable class + * @param $responseInstance An instance of a Responseable class * @return void */ function handleRequest (Requestable $requestInstance, Responseable $responseInstance); diff --git a/inc/main/interfaces/criteria/extended/class_AddableCriteria.php b/inc/main/interfaces/criteria/extended/class_AddableCriteria.php index ddc2bd07..ed6b6f4f 100644 --- a/inc/main/interfaces/criteria/extended/class_AddableCriteria.php +++ b/inc/main/interfaces/criteria/extended/class_AddableCriteria.php @@ -4,6 +4,7 @@ namespace CoreFramework\Criteria; // Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Request\Requestable; /** * An interface for classes which are allowed to add criteria diff --git a/inc/main/interfaces/discovery/class_Discoverable.php b/inc/main/interfaces/discovery/class_Discoverable.php index 1357fc0e..4c897402 100644 --- a/inc/main/interfaces/discovery/class_Discoverable.php +++ b/inc/main/interfaces/discovery/class_Discoverable.php @@ -4,6 +4,7 @@ namespace CoreFramework\Discovery; // Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Request\Requestable; /** * An interface for discovery diff --git a/inc/main/interfaces/filter/class_Filterable.php b/inc/main/interfaces/filter/class_Filterable.php index a69046d0..1a1b714c 100644 --- a/inc/main/interfaces/filter/class_Filterable.php +++ b/inc/main/interfaces/filter/class_Filterable.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filter; // Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Request\Requestable; /** * A class for pre and post filters diff --git a/inc/main/interfaces/login/class_LoginableUser.php b/inc/main/interfaces/login/class_LoginableUser.php index 4a87040b..58874c73 100644 --- a/inc/main/interfaces/login/class_LoginableUser.php +++ b/inc/main/interfaces/login/class_LoginableUser.php @@ -4,6 +4,7 @@ namespace CoreFramework\Auth; // Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Request\Requestable; /** * An interface for user login classes diff --git a/inc/main/interfaces/resolver/actions/class_ActionResolver.php b/inc/main/interfaces/resolver/actions/class_ActionResolver.php index 321a3d20..7cfdccfa 100644 --- a/inc/main/interfaces/resolver/actions/class_ActionResolver.php +++ b/inc/main/interfaces/resolver/actions/class_ActionResolver.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Resolver\Action; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * An instance for action resolver classes * @@ -35,7 +38,7 @@ interface ActionResolver extends Resolver { /** * Returns an action instance for a given request class * - * @param $requestInstance An instance of a request class + * @param $requestInstance An instance of a Requestable class * @return $actionInstance An instance of the resolved action */ function resolveActionByRequest (Requestable $requestInstance); diff --git a/inc/main/interfaces/resolver/commands/class_CommandResolver.php b/inc/main/interfaces/resolver/commands/class_CommandResolver.php index 26750caf..149fa8f2 100644 --- a/inc/main/interfaces/resolver/commands/class_CommandResolver.php +++ b/inc/main/interfaces/resolver/commands/class_CommandResolver.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Resolver\Command; +// Import framework stuff +use CoreFramework\Request\Requestable; + /** * An instance for command resolver classes * @@ -28,7 +31,7 @@ interface CommandResolver extends Resolver { /** * Returns an command instance for a given request class * - * @param $requestInstance An instance of a request class + * @param $requestInstance An instance of a Requestable class * @return $commandInstance An instance of the resolved command */ function resolveCommandByRequest (Requestable $requestInstance); diff --git a/inc/main/interfaces/template/class_CompileableTemplate.php b/inc/main/interfaces/template/class_CompileableTemplate.php index d586265f..e18190f4 100644 --- a/inc/main/interfaces/template/class_CompileableTemplate.php +++ b/inc/main/interfaces/template/class_CompileableTemplate.php @@ -129,7 +129,7 @@ interface CompileableTemplate extends FrameworkInterface { /** * Transfers the content of this template engine to a given response instance * - * @param $responseInstance An instance of a response class + * @param $responseInstance An instance of a Responsable class * @return void */ function transferToResponse (Responseable $responseInstance); diff --git a/inc/main/interfaces/user/class_ManageableAccount.php b/inc/main/interfaces/user/class_ManageableAccount.php index 20576bd8..882f96cd 100644 --- a/inc/main/interfaces/user/class_ManageableAccount.php +++ b/inc/main/interfaces/user/class_ManageableAccount.php @@ -4,6 +4,7 @@ namespace CoreFramework\User; // Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Request\Requestable; /** * An interface for manageable accounts (logged-in users and guests likewise) @@ -46,7 +47,7 @@ interface ManageableAccount extends FrameworkInterface { * Checks if supplied password hash in request matches with stored in * database. * - * @param $requestInstance A requestable class instance + * @param $requestInstance A Requestable class instance * @return $matches Whether the supplied password hash matches */ function ifPasswordHashMatches (Requestable $requestInstance); -- 2.30.2