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 14518b175a6403f45055921418691c1e75b39e7a..81f92efa38ca4971d0dcf2814d3bd324561143f8 100644 (file)
--- 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 ce27251c36ef16bf03bada3b7c27102c79b5994e..f6c51c555fc780caeebbf6a0376152f22a586b4b 100644 (file)
--- 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 cab71ab0ab47054f288041d34041579c8f72f0f0..3fa951dc6e7d782f906dc28295601681c434b3bd 100644 (file)
--- 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 777a0fae73ac0447c34a7c191fd2c1dcb96c86b0..aefa162d03abc3dd578f7ca649399185023f1f32 100644 (file)
--- 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 418c1f4c2b2bf2828280574f00951d13b243b5b7..0f665999d606d94ec639a0bd5d0d4dd9bba5d416 100644 (file)
--- 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 2a3e536ac611c8d1a874b4ff81baa18be9f6726d..c65224cd1a009f47779ffbc4c230f46446b7ef3f 100644 (file)
--- 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 9b76b414c267b9cc1a4397ed0fe5ccdd0ec6aa54..3bdebd3d703711a3249f5b221c9b8109c3bc966f 100644 (file)
--- 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 d4d1b1abc1c34f05098ab42434229ef09af25ced..5a6faf624c07de6107e6129c2a2fd167b371550d 100644 (file)
--- 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 de25ceac7e68ea9c3b2fd01ab33698aba87d0604..0a94efad607eafe12df8502e4fb9806962ee777e 100644 (file)
--- 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 fa84cef5415bebe0b6c15f4e2550428e5dd3f00d..665147384f2e233121c03df258163d894677c3a2 100644 (file)
--- 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 f55c5905a8b73285f60e4635cfe4df254a633ad8..bc4d5ee4bf05b4aee1ee9136c67df5df17bb5326 100644 (file)
--- 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 87d7a699a4449ff3d49f57452a5b89c8b8b991d1..b3f836e5bf48feeaca13ea85dcc10a05fb7a9e3f 100644 (file)
--- 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 b00c5d62caf64815fc708fa5d42f18d44833e523..f371a2bbc29308db51c858153a6533eb8135cf2f 100644 (file)
--- 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 4630820d393fece0582f4101a7aa332cee6df0e2..0563672f8cdf76cce3d3f24649fb54cf5dbb6e70 100644 (file)
--- 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 0e7c43eedbde7d4bce28e3a52bc897b24f90fcac..1f02fb783a60e7764ebc71be1efc409e2c84aef7 100644 (file)
--- 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 7ae53d89d1e9689f53335705817e9b8daa4af2f0..fbb52a13a4fbe0c07c61686d617ce86dfc4ed03c 100644 (file)
--- 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 07fa5573f9242292992e03f808860034e0591260..5515265bdcdea40cb070260469ce0157d43ca4db 100644 (file)
--- 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 31e7e8726e3f505475b675d5a1e80a4c7feac383..30ae7c68323daa309dea43036b041406c14ca22e 100644 (file)
--- 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 b6afce686811667f091f0d7305d8d107a4031413..36e7937ff1c0f6e98e3bd0a81388678c74ba831b 100644 (file)
--- 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 fb02a790094226f2eb65e1da53b4506b1e417744..2821d3aeb2f2738e77d2cf33ba254664e02ffdd2 100644 (file)
--- 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;