From 34bf02ea7094cffa13589b6b8d32fd80d29a8a6d Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 25 Feb 2017 16:43:20 +0100 Subject: [PATCH] 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) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/config.php | 4 ++-- inc/main/classes/class_BaseFrameworkSystem.php | 2 ++ inc/main/classes/criteria/class_BaseCriteria.php | 1 + inc/main/classes/criteria/dataset/class_DataSetCriteria.php | 3 +++ inc/main/classes/criteria/search/class_SearchCriteria.php | 3 +++ inc/main/classes/criteria/update/class_UpdateCriteria.php | 3 +++ .../database/backend/class_CachedLocalFileDatabase.php | 1 + inc/main/classes/database/class_BaseDatabaseWrapper.php | 1 + .../classes/database/frontend/class_NewsDatabaseWrapper.php | 3 ++- .../database/frontend/class_UserPointsDatabaseWrapper.php | 1 + .../classes/discovery/payment/class_LocalPaymentDiscovery.php | 1 + inc/main/classes/points/class_UserPoints.php | 1 + inc/main/classes/reader/class_ConsoleNewsReader.php | 1 + inc/main/classes/reader/class_DefaultNewsReader.php | 1 + .../criteria/extended/class_LocalSearchCriteria.php | 3 +++ .../criteria/extended/class_LocalUpdateCriteria.php | 3 +++ .../interfaces/criteria/extended/class_StoreableCriteria.php | 3 +++ inc/main/interfaces/database/class_DatabaseWrapper.php | 1 + .../database/middleware/class_DatabaseConnector.php | 3 +++ inc/main/middleware/database/class_DatabaseConnection.php | 1 + 20 files changed, 37 insertions(+), 3 deletions(-) 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 @@