From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Feb 2017 15:43:20 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=34bf02ea7094cffa13589b6b8d32fd80d29a8a6d;p=core.git

Continued:
- added "import" of DatabaseWrapperFactory
- added "import" of BaseDatabaseWrapper
- added "import" of SearchCriteria
- added "import" of Criteria
- expanded configuration entry with namespace (more will come)

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

diff --git a/inc/config.php b/inc/config.php
index 14518b17..81f92efa 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -170,7 +170,7 @@ $cfg->setConfigEntry('verbose_level', 0);
 $cfg->setConfigEntry('cache_class', 'MemoryCache');
 
 // CFG: SEARCH-CRITERIA-CLASS
-$cfg->setConfigEntry('search_criteria_class', 'SearchCriteria');
+$cfg->setConfigEntry('search_criteria_class', 'CoreFramework\Criteria\Search\SearchCriteria');
 
 // CFG: DATASET-CRITERIA-CLASS
 $cfg->setConfigEntry('dataset_criteria_class', 'DataSetCriteria');
@@ -248,7 +248,7 @@ $cfg->setConfigEntry('rng_class', 'RandomNumberGenerator');
 $cfg->setConfigEntry('user_db_wrapper_class', 'UserDatabaseWrapper');
 
 // CFG: NEWS-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('news_db_wrapper_class', 'NewsDatabaseWrapper');
+$cfg->setConfigEntry('news_db_wrapper_class', 'CoreFramework\Database\Wrapper\News\NewsDatabaseWrapper');
 
 // CFG: HTML-CMD-RESOLVER-CLASS
 $cfg->setConfigEntry('html_cmd_resolver_class', 'HtmlCommandResolver');
diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index ce27251c..f6c51c55 100644
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -5,6 +5,8 @@ namespace CoreFramework\Object;
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Criteria\Criteria;
+use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Generic\NullPointerException;
diff --git a/inc/main/classes/criteria/class_BaseCriteria.php b/inc/main/classes/criteria/class_BaseCriteria.php
index cab71ab0..3fa951dc 100644
--- a/inc/main/classes/criteria/class_BaseCriteria.php
+++ b/inc/main/classes/criteria/class_BaseCriteria.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Criteria;
 
 // Import framework stuff
+use CoreFramework\Criteria\Search\SearchCriteria;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/criteria/dataset/class_DataSetCriteria.php b/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
index 777a0fae..aefa162d 100644
--- a/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
+++ b/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Criteria\DataSet;
 
+// Import framework stuff
+use CoreFramework\Criteria\BaseCriteria;
+
 /**
  * A set of data storeable in databases
  *
diff --git a/inc/main/classes/criteria/search/class_SearchCriteria.php b/inc/main/classes/criteria/search/class_SearchCriteria.php
index 418c1f4c..0f665999 100644
--- a/inc/main/classes/criteria/search/class_SearchCriteria.php
+++ b/inc/main/classes/criteria/search/class_SearchCriteria.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Criteria\Search;
 
+// Import framework stuff
+use CoreFramework\Criteria\BaseCriteria;
+
 /**
  * Search criteria for e.g. searching in databases. Do not use this class if
  * you are looking for a ship or company, or what ever. Instead use this class
diff --git a/inc/main/classes/criteria/update/class_UpdateCriteria.php b/inc/main/classes/criteria/update/class_UpdateCriteria.php
index 2a3e536a..c65224cd 100644
--- a/inc/main/classes/criteria/update/class_UpdateCriteria.php
+++ b/inc/main/classes/criteria/update/class_UpdateCriteria.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Criteria\Update;
 
+// Import framework stuff
+use CoreFramework\Criteria\BaseCriteria;
+
 /**
  * Search criteria for e.g. searching in databases. Do not use this class if
  * you are looking for a ship or company, or what ever. Instead use this class
diff --git a/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php b/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
index 9b76b414..3bdebd3d 100644
--- a/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
+++ b/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Database\Backend\Lfdb;
 
 // Import framework stuff
+use CoreFramework\Criteria\Criteria;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkException;
 
diff --git a/inc/main/classes/database/class_BaseDatabaseWrapper.php b/inc/main/classes/database/class_BaseDatabaseWrapper.php
index d4d1b1ab..5a6faf62 100644
--- a/inc/main/classes/database/class_BaseDatabaseWrapper.php
+++ b/inc/main/classes/database/class_BaseDatabaseWrapper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Database\Wrapper;
 
 // Import framework stuff
+use CoreFramework\Criteria\Criteria;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
diff --git a/inc/main/classes/database/frontend/class_NewsDatabaseWrapper.php b/inc/main/classes/database/frontend/class_NewsDatabaseWrapper.php
index de25ceac..0a94efad 100644
--- a/inc/main/classes/database/frontend/class_NewsDatabaseWrapper.php
+++ b/inc/main/classes/database/frontend/class_NewsDatabaseWrapper.php
@@ -1,8 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Database\Wrapper;
+namespace CoreFramework\Database\Wrapper\News;
 
 // Import framework stuff
+use CoreFramework\Database\Wrapper\BaseDatabaseWrapper;
 use CoreFramework\Registry\Registerable;
 
 /**
diff --git a/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php b/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
index fa84cef5..66514738 100644
--- a/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
+++ b/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Database\Wrapper\Points;
 
 // Import framework stuff
+use CoreFramework\Database\Wrapper\BaseDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 
diff --git a/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php b/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
index f55c5905..bc4d5ee4 100644
--- a/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
+++ b/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Discovery\Payment;
 
 // Import framework stuff
+use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
 use CoreFramework\Registry\Registerable;
diff --git a/inc/main/classes/points/class_UserPoints.php b/inc/main/classes/points/class_UserPoints.php
index 87d7a699..b3f836e5 100644
--- a/inc/main/classes/points/class_UserPoints.php
+++ b/inc/main/classes/points/class_UserPoints.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\User\Point;
 
 // Import framework stuff
+use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
diff --git a/inc/main/classes/reader/class_ConsoleNewsReader.php b/inc/main/classes/reader/class_ConsoleNewsReader.php
index b00c5d62..f371a2bb 100644
--- a/inc/main/classes/reader/class_ConsoleNewsReader.php
+++ b/inc/main/classes/reader/class_ConsoleNewsReader.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Reader\News\Console;
 
 // Import framework stuff
+use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Reader\News\ReadableNews;
diff --git a/inc/main/classes/reader/class_DefaultNewsReader.php b/inc/main/classes/reader/class_DefaultNewsReader.php
index 4630820d..0563672f 100644
--- a/inc/main/classes/reader/class_DefaultNewsReader.php
+++ b/inc/main/classes/reader/class_DefaultNewsReader.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Reader\News;
 
 // Import framework stuff
+use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
diff --git a/inc/main/interfaces/criteria/extended/class_LocalSearchCriteria.php b/inc/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
index 0e7c43ee..1f02fb78 100644
--- a/inc/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
+++ b/inc/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Criteria\Local;
 
+// Import framework stuff
+use CoreFramework\Criteria\Criteria;
+
 /**
  * An interface for local criterias
  *
diff --git a/inc/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php b/inc/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
index 7ae53d89..fbb52a13 100644
--- a/inc/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
+++ b/inc/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Criteria\Local;
 
+// Import framework stuff
+use CoreFramework\Criteria\Criteria;
+
 /**
  * An interface for local criterias
  *
diff --git a/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php b/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
index 07fa5573..5515265b 100644
--- a/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
+++ b/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Criteria;
 
+// Import framework stuff
+use CoreFramework\Criteria\Criteria;
+
 /**
  * An interface for storeable data sets
  *
diff --git a/inc/main/interfaces/database/class_DatabaseWrapper.php b/inc/main/interfaces/database/class_DatabaseWrapper.php
index 31e7e872..30ae7c68 100644
--- a/inc/main/interfaces/database/class_DatabaseWrapper.php
+++ b/inc/main/interfaces/database/class_DatabaseWrapper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Wrapper\Database;
 
 // Import framework stuff
+use CoreFramework\Criteria\Criteria;
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/database/middleware/class_DatabaseConnector.php b/inc/main/interfaces/database/middleware/class_DatabaseConnector.php
index b6afce68..36e7937f 100644
--- a/inc/main/interfaces/database/middleware/class_DatabaseConnector.php
+++ b/inc/main/interfaces/database/middleware/class_DatabaseConnector.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Connector\Database;
 
+// Import framework stuff
+use CoreFramework\Criteria\Criteria;
+
 /**
  * An interface for middleware database classes
  *
diff --git a/inc/main/middleware/database/class_DatabaseConnection.php b/inc/main/middleware/database/class_DatabaseConnection.php
index fb02a790..2821d3ae 100644
--- a/inc/main/middleware/database/class_DatabaseConnection.php
+++ b/inc/main/middleware/database/class_DatabaseConnection.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Connection\Database;
 
 // Import framework stuff
+use CoreFramework\Criteria\Criteria;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Middleware\BaseMiddleware;
 use CoreFramework\Middleware\Debug\DebugMiddleware;