Continued:

- fixed config entry, missing namespace part
- added "import" of UserDatabaseWrapper
- added "import" of BaseDatabaseWrapper
- added "import" of UserRegister
- added "import" of UpdateableResult

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/config.php b/framework/config.php
index 67322c0c8de66447661f0774a736c70ec403ce44..86af32de43602d831a24dbb6bd01739a0244d079 100644 (file)
--- 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('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');
 
 // 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 ee869aa6a26f2b369702b3931e1b48fe5354c27e..ac5fc6bb28c3ddcf42767b47caca7481bc3cccf0 100644 (file)
--- 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\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;

+use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;

 
 /**
  * A command for the confirmation link handling
 
 /**
  * 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 cc520f6a38c2afd37dfe7f6709f4fc26ee7875c7..25b9f004b2f8047c941ee3b83dd177eb783cce45 100644 (file)
--- 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\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
 
 /**
  * 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 2cd8c658ebc61e092a01570a37ec9703d92741ac..f34347b36ebac8e440dfd752e56edd484972fd2c 100644 (file)
--- 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;
 
 // Own namespace
 namespace CoreFramework\Wrapper\Database;
 

+// Import framework stuff
+use CoreFramework\Wrapper\Database\BaseDatabaseWrapper;
+

 /**
  * A database wrapper for payments
  *
 /**
  * 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 13f53ca8498867160134f22465fb289de08feb9c..b1288cdfccf5f2abe7cd604f95c32068afe36e7b 100644 (file)
--- 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;
 // 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\Registry\Registerable;
 use CoreFramework\Result\Update\UpdateableResult;

+use CoreFramework\Wrapper\Account\ManageableAccountWrapper;
+use CoreFramework\Wrapper\Database\BaseDatabaseWrapper;

 
 /**
  * A database wrapper for the User class
 
 /**
  * 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 1e2c75b1e88b1e6b4647200b3ee18cb57c0e2b0d..8b2b52343caf9f04073f93d52712094a353049fa 100644 (file)
--- 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\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
 
 /**
  * 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 801ef66e0f597cd3b45e4b68ae913aa385f4c7a1..70639077702c67c0b00c35976e61e0bb36ae0a87 100644 (file)
--- 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\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.
 
 /**
  * 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 a8dd5e8e72d88189f38ef65d5dfbaf929a98cce0..2acbb9290ed768b9a74c110c83845ebcacfdfd80 100644 (file)
--- 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\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.
 
 /**
  * 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 bb96a952f27254e69ad8e379a55f478c03ebfccb..4e6fbc47eda7f2406279028dc0d263f85b4cb52b 100644 (file)
--- 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\Generic\NullPointerException;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;

+use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;

 
 /**
  * A helper for constructing web forms
 
 /**
  * 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 c7144f9f9a960d98359f082e1591b82930ad3d84..58d0850aeceda931532a5b64b6b0424eeac357f8 100644 (file)
--- 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\Object\BaseFrameworkSystem;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Result\Search\SearchableResult;

+use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;

 
 /**
  * A general user class
 
 /**
  * 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 60827ccae1be1f982d89c6c7ae09009b887cd0b0..6d7e184974bd2ddc0000395a824bd6bd23922122 100644 (file)
--- 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;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;

+use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;

 
 /**
  * A generic class for handling users
 
 /**
  * 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 4b648d79449e5b649425c91f8d7902d0d7d0288e..386a85396b498f54d2e2e3a5bda96ea4da410521 100644 (file)
--- 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;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkException;

+use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;

 
 /**
  * An exception for non-guest accounts (but guest was expected)
 
 /**
  * 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 ed35a64f4a791038debf9533317c06fac5cb9982..4f40af5e4139ef1f8afe6a56529795ed2310538c 100644 (file)
--- 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
 namespace CoreFramework\Wrapper\Account;
 
 // Import framework stuff

+use CoreFramework\Registration\User\UserRegister;
+use CoreFramework\Result\Update\UpdateableResult;

 use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 /**
 use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 /**

diff --git a/framework/main/interfaces/registration/class_UserRegister.php b/framework/main/interfaces/registration/class_UserRegister.php
index 375bf280e187d5dc86f37d9fc3d13ec76bb5213f..6d570eb30342bb359e66649e255aa94911ff2dc4 100644 (file)
--- a/framework/main/interfaces/registration/class_UserRegister.php
+++ b/framework/main/interfaces/registration/class_UserRegister.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
 <?php
 // Own namespace

-namespace CoreFramework\User\Registration;
+namespace CoreFramework\Registration\User;

 
 // Import framework stuff
 use CoreFramework\Criteria\Add\AddableCriteria;
 
 // Import framework stuff
 use CoreFramework\Criteria\Add\AddableCriteria;