From dfaae5be1dbac2ba13bbb315c3e6c672b490cdbe Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Feb 2017 17:30:42 +0100
Subject: [PATCH] Fixed and continued: - need to call
 ApplicationHelper::createDebugInstance() before inc/database.php   is being
 loaded. This is old way anyway and will be rewritten right after this  
 rewrite. - added "import" of CachedDatabaseResult and moved it to better
 namespace - added "import of SearchableResult - fixed config entry for it -
 first BaseDatabaseResult is a result, then it is for databases (queries)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 application/tests/init.php                                    | 4 ++++
 inc/config.php                                                | 2 +-
 inc/main/classes/class_BaseFrameworkSystem.php                | 2 ++
 inc/main/classes/database/class_BaseDatabaseResult.php        | 2 +-
 .../classes/database/result/class_CachedDatabaseResult.php    | 3 ++-
 inc/main/classes/user/class_BaseUser.php                      | 1 +
 inc/main/interfaces/result/class_SearchableResult.php         | 2 +-
 inc/main/middleware/database/class_DatabaseConnection.php     | 1 +
 8 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/application/tests/init.php b/application/tests/init.php
index 00cf2f4d..188d06af 100644
--- a/application/tests/init.php
+++ b/application/tests/init.php
@@ -1,6 +1,7 @@
 <?php
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Helper\Application\ApplicationHelper;
 use CoreFramework\Loader\ClassLoader;
 
 /**
@@ -31,6 +32,9 @@ ClassLoader::scanApplicationClasses();
 // Get config instance
 $cfg = FrameworkConfiguration::getSelfInstance();
 
+// Initialize output system
+ApplicationHelper::createDebugInstance('ApplicationHelper');
+
 // This application needs a database connection then we have to simply include
 // the inc/database.php script
 require($cfg->getConfigEntry('base_path') . 'inc/database.php');
diff --git a/inc/config.php b/inc/config.php
index b33f3d36..bd6ef833 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -182,7 +182,7 @@ $cfg->setConfigEntry('update_criteria_class', 'UpdateCriteria');
 $cfg->setConfigEntry('file_io_class', 'CoreFramework\Handler\Filesystem\FileIoHandler');
 
 // CFG: DATABASE-RESULT-CLASS
-$cfg->setConfigEntry('database_result_class', 'CachedDatabaseResult');
+$cfg->setConfigEntry('database_result_class', 'CoreFramework\Result\Database\CachedDatabaseResult');
 
 // CFG: FILTER-CHAIN-CLASS
 $cfg->setConfigEntry('filter_chain_class', 'CoreFramework\Chain\Filter\FilterChain');
diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index f306b320..e4c03668 100644
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -23,6 +23,8 @@ use CoreFramework\Registry\Register;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Resolver;
+use CoreFramework\Result\Database\CachedDatabaseResult;
+use CoreFramework\Result\Search\SearchableResult;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Stream\Output\OutputStreamer;
 use CoreFramework\Template\CompileableTemplate;
diff --git a/inc/main/classes/database/class_BaseDatabaseResult.php b/inc/main/classes/database/class_BaseDatabaseResult.php
index 3d598db4..eac2e343 100644
--- a/inc/main/classes/database/class_BaseDatabaseResult.php
+++ b/inc/main/classes/database/class_BaseDatabaseResult.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Database\Result;
+namespace CoreFramework\Result\Database;
 
 // Import framework stuff
 use CoreFramework\Object\BaseFrameworkSystem;
diff --git a/inc/main/classes/database/result/class_CachedDatabaseResult.php b/inc/main/classes/database/result/class_CachedDatabaseResult.php
index 15293b6a..40b2c3cd 100644
--- a/inc/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/inc/main/classes/database/result/class_CachedDatabaseResult.php
@@ -1,12 +1,13 @@
 <?php
 // Own namespace
-namespace CoreFramework\Database\Result;
+namespace CoreFramework\Result\Database;
 
 // Import framework stuff
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Database\Backend\BaseDatabaseBackend;
 use CoreFramework\Request\Requestable;
+use CoreFramework\Result\Search\SearchableResult;
 
 /**
  * A database result class
diff --git a/inc/main/classes/user/class_BaseUser.php b/inc/main/classes/user/class_BaseUser.php
index f4732f21..c7144f9f 100644
--- a/inc/main/classes/user/class_BaseUser.php
+++ b/inc/main/classes/user/class_BaseUser.php
@@ -6,6 +6,7 @@ namespace CoreFramework\User;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Request\Requestable;
+use CoreFramework\Result\Search\SearchableResult;
 
 /**
  * A general user class
diff --git a/inc/main/interfaces/result/class_SearchableResult.php b/inc/main/interfaces/result/class_SearchableResult.php
index 611231f5..6d86645a 100644
--- a/inc/main/interfaces/result/class_SearchableResult.php
+++ b/inc/main/interfaces/result/class_SearchableResult.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Database\Result;
+namespace CoreFramework\Result\Search;
 
 // Import framework stuff
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
diff --git a/inc/main/middleware/database/class_DatabaseConnection.php b/inc/main/middleware/database/class_DatabaseConnection.php
index 9c539597..7d7686a7 100644
--- a/inc/main/middleware/database/class_DatabaseConnection.php
+++ b/inc/main/middleware/database/class_DatabaseConnection.php
@@ -67,6 +67,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 	 *
 	 * @param	$debugInstance	An instance of a DebugMiddleware class
 	 * @param	$dbLayer		An instance of a DatabaseBackend class
+	 * @todo	$debugInstance is currently not used
 	 */
 	public static final function createDatabaseConnection (DebugMiddleware $debugInstance, DatabaseBackend $dbLayer) {
 		// Get instance
-- 
2.39.5