From af6e81a3d07cf468d3fa8cb53a9899790da2a7a1 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 26 Feb 2017 20:14:18 +0100 Subject: [PATCH] Continued: - fixed config entry, missing namespace part - added "import" of UserDatabaseWrapper - added "import" of BaseDatabaseWrapper - added "import" of UserRegister - added "import" of UpdateableResult MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- framework/config.php | 2 +- .../main/classes/commands/html/class_HtmlConfirmCommand.php | 1 + .../main/classes/commands/html/class_HtmlResendLinkCommand.php | 1 + .../database/frontend/class_PaymentsDatabaseWrapper.php | 3 +++ .../classes/database/frontend/class_UserDatabaseWrapper.php | 3 +++ .../filter/update/class_UserStatusConfimedUpdateFilter.php | 1 + .../filter/verifier/class_ConfirmCodeVerifierFilter.php | 1 + .../filter/verifier/class_UserUnconfirmedVerifierFilter.php | 1 + .../main/classes/helper/html/forms/class_HtmlFormHelper.php | 1 + framework/main/classes/user/class_BaseUser.php | 1 + framework/main/classes/user/member/class_Member.php | 1 + framework/main/exceptions/user/class_UserNoGuestException.php | 1 + .../database/wrapper/class_ManageableAccountWrapper.php | 2 ++ framework/main/interfaces/registration/class_UserRegister.php | 2 +- 14 files changed, 19 insertions(+), 2 deletions(-) diff --git a/framework/config.php b/framework/config.php index 67322c0c..86af32de 100644 --- a/framework/config.php +++ b/framework/config.php @@ -245,7 +245,7 @@ $cfg->setConfigEntry('crypto_class', 'CryptoHelper'); $cfg->setConfigEntry('rng_class', 'RandomNumberGenerator'); // CFG: USER-DB-WRAPPER-CLASS -$cfg->setConfigEntry('user_db_wrapper_class', 'UserDatabaseWrapper'); +$cfg->setConfigEntry('user_db_wrapper_class', 'CoreFramework\Wrapper\Database\User\UserDatabaseWrapper'); // CFG: NEWS-DB-WRAPPER-CLASS $cfg->setConfigEntry('news_db_wrapper_class', 'CoreFramework\Wrapper\Database\News\NewsDatabaseWrapper'); diff --git a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php index ee869aa6..ac5fc6bb 100644 --- a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php +++ b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php @@ -12,6 +12,7 @@ use CoreFramework\Registry\Registry; use CoreFramework\Request\Requestable; use CoreFramework\Resolver\Command\CommandResolver; use CoreFramework\Response\Responseable; +use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper; /** * A command for the confirmation link handling diff --git a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php index cc520f6a..25b9f004 100644 --- a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php +++ b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php @@ -11,6 +11,7 @@ use CoreFramework\Registry\Registry; use CoreFramework\Request\Requestable; use CoreFramework\Resolver\Command\CommandResolver; use CoreFramework\Response\Responseable; +use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper; /** * A command class for resending the confirmation link diff --git a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php index 2cd8c658..f34347b3 100644 --- a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php +++ b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Wrapper\Database; +// Import framework stuff +use CoreFramework\Wrapper\Database\BaseDatabaseWrapper; + /** * A database wrapper for payments * diff --git a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php index 13f53ca8..b1288cdf 100644 --- a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php +++ b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php @@ -5,8 +5,11 @@ namespace CoreFramework\Wrapper\Database\User; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Generic\NullPointerException; +use CoreFramework\Registration\User\UserRegister; use CoreFramework\Registry\Registerable; use CoreFramework\Result\Update\UpdateableResult; +use CoreFramework\Wrapper\Account\ManageableAccountWrapper; +use CoreFramework\Wrapper\Database\BaseDatabaseWrapper; /** * A database wrapper for the User class diff --git a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php index 1e2c75b1..8b2b5234 100644 --- a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php +++ b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php @@ -8,6 +8,7 @@ use CoreFramework\Filter\Filterable; use CoreFramework\Registry\Registry; use CoreFramework\Request\Requestable; use CoreFramework\Response\Responseable; +use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper; /** * A filter for updating the user account status to confirmed diff --git a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php index 801ef66e..70639077 100644 --- a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php @@ -8,6 +8,7 @@ use CoreFramework\Filter\Filterable; use CoreFramework\Registry\Registry; use CoreFramework\Request\Requestable; use CoreFramework\Response\Responseable; +use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper; /** * A filter for checking if supplied confirmation code is valid. diff --git a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php index a8dd5e8e..2acbb929 100644 --- a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php @@ -8,6 +8,7 @@ use CoreFramework\Filter\Filterable; use CoreFramework\Registry\Registry; use CoreFramework\Request\Requestable; use CoreFramework\Response\Responseable; +use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper; /** * A filter for checking if user status is UNCONFIRMED. diff --git a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php index bb96a952..4e6fbc47 100644 --- a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php +++ b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php @@ -8,6 +8,7 @@ use CoreFramework\Generic\EmptyVariableException; use CoreFramework\Generic\NullPointerException; use CoreFramework\Registry\Registry; use CoreFramework\Template\CompileableTemplate; +use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper; /** * A helper for constructing web forms diff --git a/framework/main/classes/user/class_BaseUser.php b/framework/main/classes/user/class_BaseUser.php index c7144f9f..58d0850a 100644 --- a/framework/main/classes/user/class_BaseUser.php +++ b/framework/main/classes/user/class_BaseUser.php @@ -7,6 +7,7 @@ use CoreFramework\Factory\ObjectFactory; use CoreFramework\Object\BaseFrameworkSystem; use CoreFramework\Request\Requestable; use CoreFramework\Result\Search\SearchableResult; +use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper; /** * A general user class diff --git a/framework/main/classes/user/member/class_Member.php b/framework/main/classes/user/member/class_Member.php index 60827cca..6d7e1849 100644 --- a/framework/main/classes/user/member/class_Member.php +++ b/framework/main/classes/user/member/class_Member.php @@ -5,6 +5,7 @@ namespace CoreFramework\User\Login; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Registerable; +use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper; /** * A generic class for handling users diff --git a/framework/main/exceptions/user/class_UserNoGuestException.php b/framework/main/exceptions/user/class_UserNoGuestException.php index 4b648d79..386a8539 100644 --- a/framework/main/exceptions/user/class_UserNoGuestException.php +++ b/framework/main/exceptions/user/class_UserNoGuestException.php @@ -4,6 +4,7 @@ namespace CoreFramework\Deprecated; // Import framework stuff use CoreFramework\Generic\FrameworkException; +use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper; /** * An exception for non-guest accounts (but guest was expected) diff --git a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php index ed35a64f..4f40af5e 100644 --- a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php +++ b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php @@ -3,6 +3,8 @@ namespace CoreFramework\Wrapper\Account; // Import framework stuff +use CoreFramework\Registration\User\UserRegister; +use CoreFramework\Result\Update\UpdateableResult; use CoreFramework\Wrapper\Database\DatabaseWrapper; /** diff --git a/framework/main/interfaces/registration/class_UserRegister.php b/framework/main/interfaces/registration/class_UserRegister.php index 375bf280..6d570eb3 100644 --- a/framework/main/interfaces/registration/class_UserRegister.php +++ b/framework/main/interfaces/registration/class_UserRegister.php @@ -1,6 +1,6 @@