From 54a56ed3c7cef5e7989100d2c5a7de8647d545de Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 19 May 2017 15:32:22 +0200
Subject: [PATCH] First Database, then Frontend (not Wrapper)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 framework/config-global.php                                   | 4 ++--
 framework/main/classes/class_BaseFrameworkSystem.php          | 2 +-
 .../main/classes/commands/html/class_HtmlConfirmCommand.php   | 2 +-
 .../classes/commands/html/class_HtmlResendLinkCommand.php     | 2 +-
 framework/main/classes/database/class_BaseDatabaseWrapper.php | 2 +-
 .../classes/database/frontend/class_NewsDatabaseWrapper.php   | 4 ++--
 .../database/frontend/class_PaymentsDatabaseWrapper.php       | 4 ++--
 .../classes/database/frontend/class_UserDatabaseWrapper.php   | 4 ++--
 .../database/frontend/class_UserPointsDatabaseWrapper.php     | 4 ++--
 .../classes/database/result/class_CachedDatabaseResult.php    | 2 +-
 .../filter/update/class_UserStatusConfimedUpdateFilter.php    | 2 +-
 .../filter/verifier/class_ConfirmCodeVerifierFilter.php       | 2 +-
 .../filter/verifier/class_UserUnconfirmedVerifierFilter.php   | 2 +-
 .../main/classes/helper/html/forms/class_HtmlFormHelper.php   | 2 +-
 framework/main/classes/user/class_BaseUser.php                | 2 +-
 framework/main/classes/user/member/class_Member.php           | 2 +-
 framework/main/exceptions/user/class_UserNoGuestException.php | 2 +-
 framework/main/interfaces/database/class_DatabaseWrapper.php  | 2 +-
 .../database/wrapper/class_BookablePointsWrapper.php          | 4 ++--
 .../database/wrapper/class_ManageableAccountWrapper.php       | 2 +-
 framework/main/interfaces/result/class_SearchableResult.php   | 2 +-
 21 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/framework/config-global.php b/framework/config-global.php
index f11a27e7..303029d5 100644
--- a/framework/config-global.php
+++ b/framework/config-global.php
@@ -238,10 +238,10 @@ $cfg->setConfigEntry('crypto_class', 'CoreFramework\Helper\Crypto\CryptoHelper')
 $cfg->setConfigEntry('rng_class', 'CoreFramework\Crypto\RandomNumber\RandomNumberGenerator');
 
 // CFG: USER-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('user_db_wrapper_class', 'CoreFramework\Wrapper\Database\User\UserDatabaseWrapper');
+$cfg->setConfigEntry('user_db_wrapper_class', 'CoreFramework\Database\Frontend\User\UserDatabaseWrapper');
 
 // CFG: NEWS-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('news_db_wrapper_class', 'CoreFramework\Wrapper\Database\News\NewsDatabaseWrapper');
+$cfg->setConfigEntry('news_db_wrapper_class', 'CoreFramework\Database\Frontend\News\NewsDatabaseWrapper');
 
 // CFG: HTML-CMD-RESOLVER-CLASS
 $cfg->setConfigEntry('html_cmd_resolver_class', 'CoreFramework\Resolver\Command\HtmlCommandResolver');
diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 248da126..ab2e5540 100644
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -13,6 +13,7 @@ use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Criteria\Local\LocalUpdateCriteria;
 use CoreFramework\Crypto\Cryptable;
 use CoreFramework\Crypto\RandomNumber\RandomNumberGenerator;
+use CoreFramework\Database\Frontend\DatabaseWrapper;
 use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filesystem\Block;
@@ -39,7 +40,6 @@ use CoreFramework\Stream\Output\OutputStreamer;
 use CoreFramework\Template\CompileableTemplate;
 use CoreFramework\User\ManageableAccount;
 use CoreFramework\Visitor\Visitor;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 // Import SPL stuff
 use \stdClass;
diff --git a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
index 9ad52885..3180836a 100644
--- a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
@@ -6,13 +6,13 @@ namespace CoreFramework\Command\Guest;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
 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 d19d9c24..aacfb613 100644
--- a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
@@ -6,12 +6,12 @@ namespace CoreFramework\Command\Guest;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 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/class_BaseDatabaseWrapper.php b/framework/main/classes/database/class_BaseDatabaseWrapper.php
index dbf0872e..5be68e3f 100644
--- a/framework/main/classes/database/class_BaseDatabaseWrapper.php
+++ b/framework/main/classes/database/class_BaseDatabaseWrapper.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database;
+namespace CoreFramework\Database\Frontend;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
diff --git a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
index fd383974..7a7d45e5 100644
--- a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
@@ -1,9 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database\News;
+namespace CoreFramework\Database\Frontend\News;
 
 // Import framework stuff
-use CoreFramework\Wrapper\Database\BaseDatabaseWrapper;
+use CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use CoreFramework\Registry\Registerable;
 
 /**
diff --git a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
index f34347b3..25ea8bad 100644
--- a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
@@ -1,9 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database;
+namespace CoreFramework\Database\Frontend;
 
 // Import framework stuff
-use CoreFramework\Wrapper\Database\BaseDatabaseWrapper;
+use CoreFramework\Database\Frontend\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 b1288cdf..27937524 100644
--- a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
@@ -1,15 +1,15 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database\User;
+namespace CoreFramework\Database\Frontend\User;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 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/database/frontend/class_UserPointsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
index 4446b637..dd6ea62e 100644
--- a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
@@ -1,9 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database\Points;
+namespace CoreFramework\Database\Frontend\Points;
 
 // Import framework stuff
-use CoreFramework\Wrapper\Database\BaseDatabaseWrapper;
+use CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 
diff --git a/framework/main/classes/database/result/class_CachedDatabaseResult.php b/framework/main/classes/database/result/class_CachedDatabaseResult.php
index 17cf461d..d69b4917 100644
--- a/framework/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/framework/main/classes/database/result/class_CachedDatabaseResult.php
@@ -6,11 +6,11 @@ namespace CoreFramework\Result\Database;
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Criteria\Local\LocalUpdateCriteria;
 use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Frontend\DatabaseWrapper;
 use CoreFramework\Database\Backend\BaseDatabaseBackend;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Result\Search\SearchableResult;
 use CoreFramework\Result\Update\UpdateableResult;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 // Import SPL stuff
 use \SeekableIterator;
diff --git a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
index 8b2b5234..cef39752 100644
--- a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
+++ b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
@@ -3,12 +3,12 @@
 namespace CoreFramework\Filter\User\Status;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Filter\BaseFilter;
 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 bbc2f17d..a5b78c11 100644
--- a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -3,12 +3,12 @@
 namespace CoreFramework\Filter\Verifier\Confirmation;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Filter\BaseFilter;
 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 73ea3840..d55b057d 100644
--- a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -3,12 +3,12 @@
 namespace CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Filter\BaseFilter;
 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 65e7f9c4..146be694 100644
--- a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
+++ b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
@@ -3,12 +3,12 @@
 namespace CoreFramework\Helper;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 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 34761fef..2dd1d9f4 100644
--- a/framework/main/classes/user/class_BaseUser.php
+++ b/framework/main/classes/user/class_BaseUser.php
@@ -3,12 +3,12 @@
 namespace CoreFramework\User;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Database\Updateable;
 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 94a37639..84f05ed8 100644
--- a/framework/main/classes/user/member/class_Member.php
+++ b/framework/main/classes/user/member/class_Member.php
@@ -3,11 +3,11 @@
 namespace CoreFramework\User\Login;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Manager\Login\ManageableMember;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\User\BaseUser;
-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 386a8539..f368f0ac 100644
--- a/framework/main/exceptions/user/class_UserNoGuestException.php
+++ b/framework/main/exceptions/user/class_UserNoGuestException.php
@@ -3,8 +3,8 @@
 namespace CoreFramework\Deprecated;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 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/class_DatabaseWrapper.php b/framework/main/interfaces/database/class_DatabaseWrapper.php
index 30ae7c68..0bd5566d 100644
--- a/framework/main/interfaces/database/class_DatabaseWrapper.php
+++ b/framework/main/interfaces/database/class_DatabaseWrapper.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database;
+namespace CoreFramework\Database\Frontend;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
diff --git a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
index 2551540b..eb34681d 100644
--- a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
+++ b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
@@ -1,10 +1,10 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database;
+namespace CoreFramework\Database\Frontend;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\DatabaseWrapper;
 use CoreFramework\Result\Update\UpdateableResult;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 /**
  * An interface for wrapper dealing with bookable points
diff --git a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
index 4f40af5e..2e884896 100644
--- a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
+++ b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
@@ -3,9 +3,9 @@
 namespace CoreFramework\Wrapper\Account;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\DatabaseWrapper;
 use CoreFramework\Registration\User\UserRegister;
 use CoreFramework\Result\Update\UpdateableResult;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 /**
  * An interface for wrapper handling manageable accounts
diff --git a/framework/main/interfaces/result/class_SearchableResult.php b/framework/main/interfaces/result/class_SearchableResult.php
index 870ecc70..ce94d28b 100644
--- a/framework/main/interfaces/result/class_SearchableResult.php
+++ b/framework/main/interfaces/result/class_SearchableResult.php
@@ -4,8 +4,8 @@ namespace CoreFramework\Result\Search;
 
 // Import framework stuff
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
+use CoreFramework\Database\Frontend\DatabaseWrapper;
 use CoreFramework\Generic\FrameworkInterface;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 /**
  * An interface for searchable results
-- 
2.39.2