From 13e20a467def3a1ce1fb10534fa2084f1959a768 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 22 Feb 2017 22:37:29 +0100 Subject: [PATCH] Continued: - "imported" Registry class - rewrote exception handler to also handle anything else that implements Throwable - please note that application//exceptions.php may become generalized and will no longer be loaded as the same functionality is provided by this framework then. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/tests/class_ApplicationHelper.php | 1 + application/tests/exceptions.php | 19 ++++++++++++------- .../application/class_BaseApplication.php | 1 + .../classes/class_BaseFrameworkSystem.php | 1 + .../html/class_HtmlConfirmCommand.php | 3 +++ .../html/class_HtmlLoginAreaCommand.php | 3 +++ .../commands/html/class_HtmlLoginCommand.php | 1 + .../html/class_HtmlRegisterCommand.php | 1 + .../html/class_HtmlResendLinkCommand.php | 3 +++ .../controller/class_BaseController.php | 1 + .../factories/client/class_ClientFactory.php | 3 +++ .../database/class_DatabaseWrapperFactory.php | 3 +++ .../index/class_FileStackIndexFactory.php | 3 +++ .../factories/login/class_LoginFactory.php | 3 +++ .../registry/class_SocketRegistryFactory.php | 3 +++ .../stacks/class_FileStackFactory.php | 2 ++ .../factories/user/class_UserFactory.php | 1 + .../xml/class_XmlTemplateEngineFactory.php | 3 +++ .../filter/auth/class_UserAuthFilter.php | 3 +++ .../filter/change/class_EmailChangeFilter.php | 3 +++ .../change/class_PasswordChangeFilter.php | 3 +++ .../filter/news/class_NewsDownloadFilter.php | 3 +++ .../payment/class_PaymentDiscoveryFilter.php | 3 +++ .../class_UserStatusConfimedUpdateFilter.php | 3 +++ .../filter/update/class_UserUpdateFilter.php | 3 +++ .../validator/class_EmailValidatorFilter.php | 3 +++ .../class_UserNameValidatorFilter.php | 3 +++ .../class_AccountPasswordVerifierFilter.php | 3 +++ .../class_ConfirmCodeVerifierFilter.php | 3 +++ .../class_UserGuestVerifierFilter.php | 3 +++ .../verifier/class_UserNameVerifierFilter.php | 3 +++ .../class_UserStatusVerifierFilter.php | 3 +++ .../class_UserUnconfirmedVerifierFilter.php | 3 +++ inc/main/classes/helper/class_BaseHelper.php | 1 + .../html/forms/class_HtmlFormHelper.php | 1 + .../html/links/class_HtmlLinkHelper.php | 1 + .../classes/language/class_LanguageSystem.php | 1 + .../classes/response/class_BaseResponse.php | 1 + .../console/class_ConsoleTemplateEngine.php | 1 + .../html/class_HtmlTemplateEngine.php | 1 + .../image/class_ImageTemplateEngine.php | 1 + .../mail/class_MailTemplateEngine.php | 1 + .../menu/class_MenuTemplateEngine.php | 1 + 43 files changed, 103 insertions(+), 7 deletions(-) diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php index 59a7182a..3d5e2c92 100644 --- a/application/tests/class_ApplicationHelper.php +++ b/application/tests/class_ApplicationHelper.php @@ -6,6 +6,7 @@ namespace CoreFramework\Helper\Application; use CoreFramework\Manager\ManageableApplication; use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Registerable; +use CoreFramework\Registry\Generic\Registry; use CoreFramework\Template\CompileableTemplate; /** diff --git a/application/tests/exceptions.php b/application/tests/exceptions.php index ea239eb5..e8e4bf36 100644 --- a/application/tests/exceptions.php +++ b/application/tests/exceptions.php @@ -27,7 +27,7 @@ use CoreFramework\Object\BaseFrameworkSystem; // The node's own exception handler function tests_exception_handler ($exceptionInstance) { // Is it an object and a valid instance? - if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof FrameworkException)) { + if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof Throwable)) { // Init variable $backTrace = ''; @@ -76,9 +76,9 @@ Backtrace: -------------------------------------------------------------------------------- %s --------------------------------------------------------------------------------\n", - trim(html_entity_decode(strip_tags($exceptionInstance->__toString()))), + trim(html_entity_decode(strip_tags(get_class($exceptionInstance)))), trim(html_entity_decode(strip_tags($exceptionInstance->getMessage()))), - $exceptionInstance->getHexCode(), + ($exceptionInstance instanceof FrameworkException ? $exceptionInstance->getHexCode() : '0x' . bin2hex($exceptionInstance->getCode())), $exceptionInstance->getFile(), $exceptionInstance->getLine(), trim($backTrace) @@ -86,11 +86,16 @@ Backtrace: // Output the message print($message); + } elseif (is_object($exceptionInstance)) { + // Output more details + printf('exceptionInstance=%s' . PHP_EOL, get_class($exceptionInstance)); } else { - // Invalid exception instance detected! Do *only* throw exceptions that - // extends our own exception 'FrameworkException' to get such nice - // outputs like above. - print('exceptionInstance[]=' . gettype($exceptionInstance) . ' is invalid! Please inform the core developer team.' . PHP_EOL); + /* + * Invalid exception instance detected! Do *only* throw exceptions that + * extends our own exception 'FrameworkException' to get such nice + * outputs like above. + */ + printf('exceptionInstance[]=%s is invalid! Please inform the core developer team.' . PHP_EOL, gettype($exceptionInstance)); } } diff --git a/inc/main/classes/application/class_BaseApplication.php b/inc/main/classes/application/class_BaseApplication.php index c1d94d66..4f977191 100644 --- a/inc/main/classes/application/class_BaseApplication.php +++ b/inc/main/classes/application/class_BaseApplication.php @@ -4,6 +4,7 @@ namespace CoreFramework\Application; // Import framework stuff use CoreFramework\Object\BaseFrameworkSystem; +use CoreFramework\Registry\Generic\Registry; /** * A general application class for the ApplicationHelper classes. diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php index 03809023..581d72d9 100644 --- a/inc/main/classes/class_BaseFrameworkSystem.php +++ b/inc/main/classes/class_BaseFrameworkSystem.php @@ -8,6 +8,7 @@ use CoreFramework\Generic\FrameworkInterface; use CoreFramework\Loader\ClassLoader; use CoreFramework\Manager\ManageableApplication; use CoreFramework\Registry\Register; +use CoreFramework\Registry\Generic\Registry; use CoreFramework\Template\CompileableTemplate; // Import SPL stuff diff --git a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php index 7534e184..1faae1b2 100644 --- a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php +++ b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Command\Guest; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A command for the confirmation link handling * diff --git a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php index f0d8c366..7c8bf3d5 100644 --- a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php +++ b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Command\Login; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * 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 8e5d1521..ccfafad2 100644 --- a/inc/main/classes/commands/html/class_HtmlLoginCommand.php +++ b/inc/main/classes/commands/html/class_HtmlLoginCommand.php @@ -4,6 +4,7 @@ namespace CoreFramework\Command\Login; // Import framework stuff use CoreFramework\Registry\Registerable; +use CoreFramework\Registry\Generic\Registry; /** * A command for the login form diff --git a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php index cf86494f..36a3c899 100644 --- a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php +++ b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php @@ -4,6 +4,7 @@ namespace CoreFramework\Command\Register; // Import framework stuff use CoreFramework\Registry\Registerable; +use CoreFramework\Registry\Generic\Registry; /** * 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 823996db..fe649116 100644 --- a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php +++ b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Command\Guest; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A command class for resending the confirmation link * diff --git a/inc/main/classes/controller/class_BaseController.php b/inc/main/classes/controller/class_BaseController.php index 080a5a5e..35d6b47e 100644 --- a/inc/main/classes/controller/class_BaseController.php +++ b/inc/main/classes/controller/class_BaseController.php @@ -4,6 +4,7 @@ namespace CoreFramework\Controller; // Import framework stuff use CoreFramework\Object\BaseFrameworkSystem; +use CoreFramework\Registry\Generic\Registry; /** * A generic controller class. You should extend this base class if you want to diff --git a/inc/main/classes/factories/client/class_ClientFactory.php b/inc/main/classes/factories/client/class_ClientFactory.php index 14b75423..81946476 100644 --- a/inc/main/classes/factories/client/class_ClientFactory.php +++ b/inc/main/classes/factories/client/class_ClientFactory.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Factory\Client; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * An object factory for clients * diff --git a/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php b/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php index a5a8a02c..6ff43572 100644 --- a/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php +++ b/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Factory\Database\Wrapper; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A factory class for socket registries * diff --git a/inc/main/classes/factories/index/class_FileStackIndexFactory.php b/inc/main/classes/factories/index/class_FileStackIndexFactory.php index b2a09bb9..03faf785 100644 --- a/inc/main/classes/factories/index/class_FileStackIndexFactory.php +++ b/inc/main/classes/factories/index/class_FileStackIndexFactory.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Factory\Filesystem\Stack; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A factory class for file-based stack indexes * diff --git a/inc/main/classes/factories/login/class_LoginFactory.php b/inc/main/classes/factories/login/class_LoginFactory.php index f5e4372b..f9b40da3 100644 --- a/inc/main/classes/factories/login/class_LoginFactory.php +++ b/inc/main/classes/factories/login/class_LoginFactory.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Factory\Login; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A factory class for socket registries * diff --git a/inc/main/classes/factories/registry/class_SocketRegistryFactory.php b/inc/main/classes/factories/registry/class_SocketRegistryFactory.php index f1ebfcd6..5ba31d05 100644 --- a/inc/main/classes/factories/registry/class_SocketRegistryFactory.php +++ b/inc/main/classes/factories/registry/class_SocketRegistryFactory.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Factory\Registry; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A factory class for socket registries * diff --git a/inc/main/classes/factories/stacks/class_FileStackFactory.php b/inc/main/classes/factories/stacks/class_FileStackFactory.php index 77ea4158..ca871fc6 100644 --- a/inc/main/classes/factories/stacks/class_FileStackFactory.php +++ b/inc/main/classes/factories/stacks/class_FileStackFactory.php @@ -4,6 +4,8 @@ namespace CoreFramework\Factory\Stack; // Import framework stuff use CoreFramework\Configuration\FrameworkConfiguration; +use CoreFramework\Registry\Generic\Registry; + /** * A factory class for file-based stacks diff --git a/inc/main/classes/factories/user/class_UserFactory.php b/inc/main/classes/factories/user/class_UserFactory.php index ac7a3a06..15063868 100644 --- a/inc/main/classes/factories/user/class_UserFactory.php +++ b/inc/main/classes/factories/user/class_UserFactory.php @@ -4,6 +4,7 @@ namespace CoreFramework\Factory\User; // Import framework stuff use CoreFramework\Configuration\FrameworkConfiguration; +use CoreFramework\Registry\Generic\Registry; /** * A factory class for socket registries diff --git a/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php b/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php index fd83f516..fdee7be8 100644 --- a/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php +++ b/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Factory\Template; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A factory class for XML template engines. All instances generated by this * factory does have language support disabled and XML-compacting enabled (to diff --git a/inc/main/classes/filter/auth/class_UserAuthFilter.php b/inc/main/classes/filter/auth/class_UserAuthFilter.php index ff067215..b11beb1d 100644 --- a/inc/main/classes/filter/auth/class_UserAuthFilter.php +++ b/inc/main/classes/filter/auth/class_UserAuthFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\User\Auth; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * 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 fe2b1e68..f99581c6 100644 --- a/inc/main/classes/filter/change/class_EmailChangeFilter.php +++ b/inc/main/classes/filter/change/class_EmailChangeFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Change\Email; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * 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 4c4de125..900eaf4b 100644 --- a/inc/main/classes/filter/change/class_PasswordChangeFilter.php +++ b/inc/main/classes/filter/change/class_PasswordChangeFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Change\Email; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A filter for password change detection * diff --git a/inc/main/classes/filter/news/class_NewsDownloadFilter.php b/inc/main/classes/filter/news/class_NewsDownloadFilter.php index c1da2193..b0a5bf52 100644 --- a/inc/main/classes/filter/news/class_NewsDownloadFilter.php +++ b/inc/main/classes/filter/news/class_NewsDownloadFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\News; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A pre-filter for downloading news from a source. This can be a XML feed or * the local database. You *can* register this filter as post filter but for diff --git a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php index 85edcc87..70b03b99 100644 --- a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php +++ b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Discovery\Payment; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A filter for payment discovery. This class discovers the payment type and * returns an object holding all available payment system for the requested diff --git a/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php index bfa4486a..990ed315 100644 --- a/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php +++ b/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\User\Status; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * 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 c64ed021..0be46b6c 100644 --- a/inc/main/classes/filter/update/class_UserUpdateFilter.php +++ b/inc/main/classes/filter/update/class_UserUpdateFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\User; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A filter for updating the user account like last activity, last action * performed and so on. diff --git a/inc/main/classes/filter/validator/class_EmailValidatorFilter.php b/inc/main/classes/filter/validator/class_EmailValidatorFilter.php index 78b78d73..66cea191 100644 --- a/inc/main/classes/filter/validator/class_EmailValidatorFilter.php +++ b/inc/main/classes/filter/validator/class_EmailValidatorFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Validator\Email; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A concrete filter for validating the email address. This filter may intercept * the filter chain if no email address is given or if supplied email has an diff --git a/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php b/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php index dfbb5f74..2afbfc6b 100644 --- a/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php +++ b/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Validator\Username; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A concrete filter for validating the username. This filter may intercept the * filter chain if no username is given or if supplied username has an invalid diff --git a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php index b27af9ef..f2459a71 100644 --- a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Verifier\Password; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * 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_ConfirmCodeVerifierFilter.php b/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php index 55f7b542..17760433 100644 --- a/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Verifier\Confirmation; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A filter for checking if supplied confirmation code is valid. * diff --git a/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php index 703d5ece..5fba45f8 100644 --- a/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Verifier\User; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A concrete filter for verfying the guest username. This filter may intercept the * filter chain if no username is given or if supplied username has an invalid diff --git a/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php index ba1b20ba..7d748c62 100644 --- a/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Verifier\User; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A concrete filter for verfying the username. This filter may intercept the * filter chain if no username is given or if supplied username has an invalid diff --git a/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php index b6ef58da..4a10efce 100644 --- a/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Verifier\User; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * 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 f71e0aa3..3c4db3c5 100644 --- a/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php +++ b/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filter\Verifier\User; +// Import framework stuff +use CoreFramework\Registry\Generic\Registry; + /** * A filter for checking if user status is UNCONFIRMED. * diff --git a/inc/main/classes/helper/class_BaseHelper.php b/inc/main/classes/helper/class_BaseHelper.php index af3222b0..b9507506 100644 --- a/inc/main/classes/helper/class_BaseHelper.php +++ b/inc/main/classes/helper/class_BaseHelper.php @@ -5,6 +5,7 @@ namespace CoreFramework\Helper; // Import framework stuff use CoreFramework\Generic\FrameworkInterface; use CoreFramework\Object\BaseFrameworkSystem; +use CoreFramework\Registry\Generic\Registry; /** * A generic helper class with generic methods diff --git a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php index accf97d3..7b6fc3aa 100644 --- a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php +++ b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php @@ -3,6 +3,7 @@ namespace CoreFramework\Helper; // Import framework stuff +use CoreFramework\Registry\Generic\Registry; use CoreFramework\Template\CompileableTemplate; /** diff --git a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php index 5ffe2940..2f0e6baf 100644 --- a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php +++ b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php @@ -4,6 +4,7 @@ namespace CoreFramework\Helper; // Import framework stuff use CoreFramework\Configuration\FrameworkConfiguration; +use CoreFramework\Registry\Generic\Registry; use CoreFramework\Template\CompileableTemplate; /** diff --git a/inc/main/classes/language/class_LanguageSystem.php b/inc/main/classes/language/class_LanguageSystem.php index 7d2ac750..ed93bb0b 100644 --- a/inc/main/classes/language/class_LanguageSystem.php +++ b/inc/main/classes/language/class_LanguageSystem.php @@ -6,6 +6,7 @@ namespace CoreFramework\Localization; use CoreFramework\Configuration\FrameworkConfiguration; use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Registry\Registerable; +use CoreFramework\Registry\Generic\Registry; /** * The language sub-system for handling language strings being used in the diff --git a/inc/main/classes/response/class_BaseResponse.php b/inc/main/classes/response/class_BaseResponse.php index 05fde732..6e1e5cf2 100644 --- a/inc/main/classes/response/class_BaseResponse.php +++ b/inc/main/classes/response/class_BaseResponse.php @@ -4,6 +4,7 @@ namespace CoreFramework\Response; // Import framework stuff use CoreFramework\Object\BaseFrameworkSystem; +use CoreFramework\Registry\Generic\Registry; /** * A generic request class diff --git a/inc/main/classes/template/console/class_ConsoleTemplateEngine.php b/inc/main/classes/template/console/class_ConsoleTemplateEngine.php index 2ac4006a..be70a160 100644 --- a/inc/main/classes/template/console/class_ConsoleTemplateEngine.php +++ b/inc/main/classes/template/console/class_ConsoleTemplateEngine.php @@ -3,6 +3,7 @@ namespace CoreFramework\Template\Engine; // Import framework stuff +use CoreFramework\Registry\Generic\Registry; use CoreFramework\Template\CompileableTemplate; /** diff --git a/inc/main/classes/template/html/class_HtmlTemplateEngine.php b/inc/main/classes/template/html/class_HtmlTemplateEngine.php index 01653334..9d7e5057 100644 --- a/inc/main/classes/template/html/class_HtmlTemplateEngine.php +++ b/inc/main/classes/template/html/class_HtmlTemplateEngine.php @@ -3,6 +3,7 @@ namespace CoreFramework\Template\Engine; // Import framework stuff +use CoreFramework\Registry\Generic\Registry; use CoreFramework\Template\CompileableTemplate; /** diff --git a/inc/main/classes/template/image/class_ImageTemplateEngine.php b/inc/main/classes/template/image/class_ImageTemplateEngine.php index ade54d13..ce192aba 100644 --- a/inc/main/classes/template/image/class_ImageTemplateEngine.php +++ b/inc/main/classes/template/image/class_ImageTemplateEngine.php @@ -3,6 +3,7 @@ namespace CoreFramework\Template\Engine; // Import framework stuff +use CoreFramework\Registry\Generic\Registry; use CoreFramework\Template\CompileableTemplate; /** diff --git a/inc/main/classes/template/mail/class_MailTemplateEngine.php b/inc/main/classes/template/mail/class_MailTemplateEngine.php index adfeffbe..51f6649b 100644 --- a/inc/main/classes/template/mail/class_MailTemplateEngine.php +++ b/inc/main/classes/template/mail/class_MailTemplateEngine.php @@ -3,6 +3,7 @@ namespace CoreFramework\Template\Engine; // Import framework stuff +use CoreFramework\Registry\Generic\Registry; use CoreFramework\Template\CompileableTemplate; /** diff --git a/inc/main/classes/template/menu/class_MenuTemplateEngine.php b/inc/main/classes/template/menu/class_MenuTemplateEngine.php index 69d112d5..5fde22c6 100644 --- a/inc/main/classes/template/menu/class_MenuTemplateEngine.php +++ b/inc/main/classes/template/menu/class_MenuTemplateEngine.php @@ -3,6 +3,7 @@ namespace CoreFramework\Template\Engine; // Import framework stuff +use CoreFramework\Registry\Generic\Registry; use CoreFramework\Template\CompileableTemplate; /** -- 2.39.5