Continued:

- added missing config entry
- expanded config entry local_file_database_class with namespace
- need to load inc/database.php (which will later also be rewritten to an OOPed way)
- added "import" of FrameworkDatabase
- added "import" of BaseDatabaseBackend
- added "import" of DatabaseBackend
- added "import" of StoreableCriteria

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

diff --git a/application/tests/config.php b/application/tests/config.php
index a4e6d86319268bd5e19ce8cd840b11a42524db6c..dbe5aa71e736144a04b2e907ec7861bbd498c673 100644 (file)
--- a/application/tests/config.php
+++ b/application/tests/config.php
@@ -47,3 +47,6 @@ $cfg->setConfigEntry('news_process_filter', 'CoreFramework\Filter\News\NewsProce
 
 // CFG: NEWS-READER-MAIN-CLASS
 $cfg->setConfigEntry('news_reader_main_class', 'CoreFramework\Reader\News\Console\ConsoleNewsReader');
+
+// CFG: NEWS-MAIN-LIMIT
+$cfg->setConfigEntry('news_main_limit', 5);

diff --git a/application/tests/init.php b/application/tests/init.php
index b877adab00baca807c763cded4126278e8bbda4d..00cf2f4d2366174b7cefbaada2aa282de33edb1d 100644 (file)
--- a/application/tests/init.php
+++ b/application/tests/init.php
@@ -30,3 +30,7 @@ ClassLoader::scanApplicationClasses();
 
 // Get config instance
 $cfg = FrameworkConfiguration::getSelfInstance();
+
+// 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 81f92efa38ca4971d0dcf2814d3bd324561143f8..262c606d7147390cca95f9446556afe35bd8d831 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -338,7 +338,7 @@ $cfg->setConfigEntry('stacker_generic_max_size', 100);
 $cfg->setConfigEntry('stacker_current_node_max_size', 20);
 
 // CFG: LOCAL-FILE-DATABASE-CLASS
-$cfg->setConfigEntry('local_file_database_class', 'CachedLocalFileDatabase');
+$cfg->setConfigEntry('local_file_database_class', 'CoreFramework\Database\Backend\Lfdb\CachedLocalFileDatabase');
 
 // CFG: COMPRESSOR-CHANNEL-CLASS
 $cfg->setConfigEntry('compressor_channel_class', 'CompressorChannel');

diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index f6c51c555fc780caeebbf6a0376152f22a586b4b..fdf7aab25be23390e3efccbfcc7ffb9580c7d51b 100644 (file)
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Object;
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Criteria\Criteria;
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;

diff --git a/inc/main/classes/criteria/dataset/class_DataSetCriteria.php b/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
index aefa162d03abc3dd578f7ca649399185023f1f32..867e6551d354c14eeeb13e2f2688379fe852f757 100644 (file)
--- a/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
+++ b/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Criteria\DataSet;
 
 // Import framework stuff
 use CoreFramework\Criteria\BaseCriteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
 
 /**
  * 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 0f665999d606d94ec639a0bd5d0d4dd9bba5d416..58e0b5e7d5a5930b3392adf58f73168e3f7f69fb 100644 (file)
--- a/inc/main/classes/criteria/search/class_SearchCriteria.php
+++ b/inc/main/classes/criteria/search/class_SearchCriteria.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Criteria\Search;
 
 // Import framework stuff
 use CoreFramework\Criteria\BaseCriteria;
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
 
 /**
  * Search criteria for e.g. searching in databases. Do not use this class if

diff --git a/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php b/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
index 3bdebd3d703711a3249f5b221c9b8109c3bc966f..fac9b9eae610e315ec6149ac0268f7c5341ee486 100644 (file)
--- a/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
+++ b/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
@@ -4,6 +4,10 @@ namespace CoreFramework\Database\Backend\Lfdb;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Backend\BaseDatabaseBackend;
+use CoreFramework\Database\Backend\DatabaseBackend;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkException;
 

diff --git a/inc/main/classes/database/class_BaseDatabaseBackend.php b/inc/main/classes/database/class_BaseDatabaseBackend.php
index c844647d7f93ba335eb97026bc6f5c597a012695..fb3bab62479a52f8c6ec81e38e366ad19cf3b659 100644 (file)
--- a/inc/main/classes/database/class_BaseDatabaseBackend.php
+++ b/inc/main/classes/database/class_BaseDatabaseBackend.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Database\Backend;
 
 // Import framework stuff
+use CoreFramework\Database\Backend\DatabaseBackend;
 use CoreFramework\Generic\FrameworkException;
 use CoreFramework\Object\BaseFrameworkSystem;
 

diff --git a/inc/main/classes/database/class_BaseDatabaseResult.php b/inc/main/classes/database/class_BaseDatabaseResult.php
index cba50e4bd0800c54ef8f696fb6b95c2c44634d38..3d598db45d7263ed6debff5cd5d9e623861ecfdd 100644 (file)
--- a/inc/main/classes/database/class_BaseDatabaseResult.php
+++ b/inc/main/classes/database/class_BaseDatabaseResult.php
@@ -8,7 +8,7 @@ use CoreFramework\Object\BaseFrameworkSystem;
 /**
  * A general class for database results
  *
- * @see                        DatabaseBackendInterface - An interface for database backends
+ * @see                        DatabaseBackend - An interface for database backends
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team

diff --git a/inc/main/classes/database/class_BaseDatabaseWrapper.php b/inc/main/classes/database/class_BaseDatabaseWrapper.php
index 5a6faf624c07de6107e6129c2a2fd167b371550d..66b1f79e0558e4c36c36282c8a5adb02a1fbaf74 100644 (file)
--- a/inc/main/classes/database/class_BaseDatabaseWrapper.php
+++ b/inc/main/classes/database/class_BaseDatabaseWrapper.php
@@ -4,6 +4,8 @@ namespace CoreFramework\Database\Wrapper;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Backend\BaseDatabaseBackend;
 use CoreFramework\Factory\ObjectFactory;
 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 4489c44bf0955849d71423bc6ff41cc2660ce9f9..15293b6a66ecb1b70794658f45b4804481973ed2 100644 (file)
--- a/inc/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/inc/main/classes/database/result/class_CachedDatabaseResult.php
@@ -3,6 +3,9 @@
 namespace CoreFramework\Database\Result;
 
 // Import framework stuff
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Backend\BaseDatabaseBackend;
 use CoreFramework\Request\Requestable;
 
 /**

diff --git a/inc/main/classes/handler/class_BaseHandler.php b/inc/main/classes/handler/class_BaseHandler.php
index e0a0d0062410839aaf30539da994c94e3812bc5c..945ebeb63a47a94f34d540b24686bdadb398fdc2 100644 (file)
--- a/inc/main/classes/handler/class_BaseHandler.php
+++ b/inc/main/classes/handler/class_BaseHandler.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Handler;
 
 // Import framework stuff
+use CoreFramework\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**

diff --git a/inc/main/classes/points/class_UserPoints.php b/inc/main/classes/points/class_UserPoints.php
index b3f836e5bf48feeaca13ea85dcc10a05fb7a9e3f..0961a489cb81d5dd5710ab91477c43dec50f2f97 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\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;

diff --git a/inc/main/interfaces/criteria/extended/class_AddableCriteria.php b/inc/main/interfaces/criteria/extended/class_AddableCriteria.php
index ed6b6f4fc256d505e660a1bba67470ee86732d1d..fbc9fc4f4790cb6cbd102f46b5261a31d34eec3d 100644 (file)
--- a/inc/main/interfaces/criteria/extended/class_AddableCriteria.php
+++ b/inc/main/interfaces/criteria/extended/class_AddableCriteria.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Criteria;
 
 // Import framework stuff
+use CoreFramework\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Request\Requestable;
 

diff --git a/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php b/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
index 5515265bdcdea40cb070260469ce0157d43ca4db..3fa2f9784a7318cf056ae996b518b18abbc8e12f 100644 (file)
--- a/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
+++ b/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Criteria;
+namespace CoreFramework\Criteria\Storing;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;

diff --git a/inc/main/interfaces/database/backend/class_DatabaseBackend.php b/inc/main/interfaces/database/backend/class_DatabaseBackend.php
index 62e116cadf435f465a7a47c5ae335dcf7c40b903..1ddd916d38337400ee8bc9cdaac121e06b80c614 100644 (file)
--- a/inc/main/interfaces/database/backend/class_DatabaseBackend.php
+++ b/inc/main/interfaces/database/backend/class_DatabaseBackend.php
@@ -2,6 +2,11 @@
 // Own namespace
 namespace CoreFramework\Database\Backend;
 
+// Import framework stuff
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\FrameworkDatabase;
+
 /**
  * An interface for front-end database classes. The classes should prepare the
  * objects for saving in the database. So for server-bases database classes SQL

diff --git a/inc/main/interfaces/database/middleware/class_DatabaseConnector.php b/inc/main/interfaces/database/middleware/class_DatabaseConnector.php
index 36e7937ff1c0f6e98e3bd0a81388678c74ba831b..0491b709ddec955e86aeaa1b3a11ee50555da062 100644 (file)
--- a/inc/main/interfaces/database/middleware/class_DatabaseConnector.php
+++ b/inc/main/interfaces/database/middleware/class_DatabaseConnector.php
@@ -4,6 +4,9 @@ namespace CoreFramework\Connector\Database;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Backend\DatabaseBackend;
+use CoreFramework\Database\FrameworkDatabase;
 
 /**
  * An interface for middleware database classes

diff --git a/inc/main/interfaces/handler/class_HandleableDataSet.php b/inc/main/interfaces/handler/class_HandleableDataSet.php
index f93933b4a60dc760705bdcedd4c273cf9de047cc..e443476844c8bb9c92fd3fe8ed45c84d28f49125 100644 (file)
--- a/inc/main/interfaces/handler/class_HandleableDataSet.php
+++ b/inc/main/interfaces/handler/class_HandleableDataSet.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Handler\DataSet;
 
+// Import framework stuff
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+
 /**
  * An interface for data set handlers
  *

diff --git a/inc/main/interfaces/result/class_SearchableResult.php b/inc/main/interfaces/result/class_SearchableResult.php
index 4bd1b7619aaa9c1e609eaa785710b712698ff04a..611231f522a4a5547560e7c1402e8f0b95c24909 100644 (file)
--- a/inc/main/interfaces/result/class_SearchableResult.php
+++ b/inc/main/interfaces/result/class_SearchableResult.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Database\Result;
 
 // Import framework stuff
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Generic\FrameworkInterface;
 
 /**

diff --git a/inc/main/middleware/database/class_DatabaseConnection.php b/inc/main/middleware/database/class_DatabaseConnection.php
index 2821d3aeb2f2738e77d2cf33ba254664e02ffdd2..7ef989b5aefe0e3f67e7723d2b221c23c9d42b04 100644 (file)
--- a/inc/main/middleware/database/class_DatabaseConnection.php
+++ b/inc/main/middleware/database/class_DatabaseConnection.php
@@ -4,6 +4,8 @@ namespace CoreFramework\Connection\Database;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Backend\DatabaseBackend;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Middleware\BaseMiddleware;
 use CoreFramework\Middleware\Debug\DebugMiddleware;