Continued:

- added "import" of DatabaseWrapper
- added "import" of AddableCriteria
- added "import" of UpdateableResult
- added "import" of LocalUpdateCriteria
- added missing namespace

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

diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index e4c03668a2e118d8ed4f914a48116a3d93f667e9..3ca59ca36e1be6a654f260e4993bb120dfc5e530 100644 (file)
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -9,6 +9,7 @@ use CoreFramework\Connection\Database\DatabaseConnection;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Criteria\Criteria;
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
+use CoreFramework\Criteria\Local\LocalUpdateCriteria;
 use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filesystem\FrameworkDirectory;
@@ -28,6 +29,7 @@ use CoreFramework\Result\Search\SearchableResult;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Stream\Output\OutputStreamer;
 use CoreFramework\Template\CompileableTemplate;
+use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 // Import SPL stuff
 use \stdClass;
@@ -743,7 +745,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        /**
         * Setter for update instance
         *
-        * @param       $updateInstance         Searchable criteria instance
+        * @param       $updateInstance         An instance of a LocalUpdateCriteria clase
         * @return      void
         */
        public final function setUpdateInstance (LocalUpdateCriteria $updateInstance) {

diff --git a/inc/main/classes/criteria/update/class_UpdateCriteria.php b/inc/main/classes/criteria/update/class_UpdateCriteria.php
index c65224cd1a009f47779ffbc4c230f46446b7ef3f..2ada2e5555a8d8888039408716328352eeb60eb0 100644 (file)
--- a/inc/main/classes/criteria/update/class_UpdateCriteria.php
+++ b/inc/main/classes/criteria/update/class_UpdateCriteria.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Criteria\Update;
 
 // Import framework stuff
 use CoreFramework\Criteria\BaseCriteria;
+use CoreFramework\Criteria\Local\LocalUpdateCriteria;
 
 /**
  * Search criteria for e.g. searching in databases. Do not use this class if

diff --git a/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php b/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php
index 1e83aefea04b42ce04d10d1b82fbf12e409d809d..0e74d864328ecc28865c3938281f50d34f8cfeb4 100644 (file)
--- a/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php
+++ b/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Database\Wrapper\User;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Registry\Registerable;
+use CoreFramework\Result\Update\UpdateableResult;
 
 /**
  * A database wrapper for the User class

diff --git a/inc/main/classes/database/result/class_CachedDatabaseResult.php b/inc/main/classes/database/result/class_CachedDatabaseResult.php
index 40b2c3cd91475aad14f8880839ff04b336f81b48..5310910151ea98b9837a7c18ca252eb61340c933 100644 (file)
--- a/inc/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/inc/main/classes/database/result/class_CachedDatabaseResult.php
@@ -4,10 +4,13 @@ namespace CoreFramework\Result\Database;
 
 // Import framework stuff
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
+use CoreFramework\Criteria\Local\LocalUpdateCriteria;
 use CoreFramework\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Database\Backend\BaseDatabaseBackend;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Result\Search\SearchableResult;
+use CoreFramework\Result\Update\UpdateableResult;
+use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 /**
  * A database result class

diff --git a/inc/main/exceptions/result/class_ResultUpdateException.php b/inc/main/exceptions/result/class_ResultUpdateException.php
index f480ce9a477b8bb5eaa8cffac1886069afa723f1..b5617fe2bdb1629760752276018c557f68701c2f 100644 (file)
--- a/inc/main/exceptions/result/class_ResultUpdateException.php
+++ b/inc/main/exceptions/result/class_ResultUpdateException.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Result;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkException;
+use CoreFramework\Result\Update\UpdateableResult;
 
 /**
  * An exception thrown if result was not updated.

diff --git a/inc/main/interfaces/criteria/extended/class_AddableCriteria.php b/inc/main/interfaces/criteria/extended/class_AddableCriteria.php
index fbc9fc4f4790cb6cbd102f46b5261a31d34eec3d..193fa7a90a105d1e109e08c7b9c6fcdb3ccd74dc 100644 (file)
--- a/inc/main/interfaces/criteria/extended/class_AddableCriteria.php
+++ b/inc/main/interfaces/criteria/extended/class_AddableCriteria.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Criteria;
+namespace CoreFramework\Criteria\Add;
 
 // Import framework stuff
 use CoreFramework\Criteria\Storing\StoreableCriteria;

diff --git a/inc/main/interfaces/database/wrapper/class_BookablePointsWrapper.php b/inc/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
index 939d6e838ac5ee71bdbb6770507a1c5a27235fbb..896bbcb9491aa3a10379ebd73f6a7ba80a9b6882 100644 (file)
--- a/inc/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
+++ b/inc/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
@@ -2,6 +2,10 @@
 // Own namespace
 namespace CoreFramework\Database\Wrapper;
 
+// Import framework stuff
+use CoreFramework\Result\Update\UpdateableResult;
+use CoreFramework\Wrapper\Database\DatabaseWrapper;
+
 /**
  * An interface for wrapper dealing with bookable points
  *

diff --git a/inc/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php b/inc/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
index c41c9bd308839e397310b9d7874ebc05e2eab11f..ed35a64f4a791038debf9533317c06fac5cb9982 100644 (file)
--- a/inc/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
+++ b/inc/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Wrapper\Account;
+
+// Import framework stuff
+use CoreFramework\Wrapper\Database\DatabaseWrapper;
+
 /**
  * An interface for wrapper handling manageable accounts
  *

diff --git a/inc/main/interfaces/points/class_BookablePoints.php b/inc/main/interfaces/points/class_BookablePoints.php
index e848b8e59156490f6c108d421263572869cdb94a..66d565199e4a8c8b48e4f4110b61a45f83451d18 100644 (file)
--- a/inc/main/interfaces/points/class_BookablePoints.php
+++ b/inc/main/interfaces/points/class_BookablePoints.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\User\Points;
 
+// Import framework stuff
+use CoreFramework\Criteria\Add\AddableCriteria;
+
 /**
  * An interface for bookable points
  *

diff --git a/inc/main/interfaces/registration/class_UserRegister.php b/inc/main/interfaces/registration/class_UserRegister.php
index 6ebfe562713fcc968434433169bf8020f24ea12f..375bf280e187d5dc86f37d9fc3d13ec76bb5213f 100644 (file)
--- a/inc/main/interfaces/registration/class_UserRegister.php
+++ b/inc/main/interfaces/registration/class_UserRegister.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\User\Registration;
 
+// Import framework stuff
+use CoreFramework\Criteria\Add\AddableCriteria;
+
 /**
  * A class for user registration
  *

diff --git a/inc/main/interfaces/result/class_SearchableResult.php b/inc/main/interfaces/result/class_SearchableResult.php
index 6d86645a6fd3e6e0e69214a0a0ef401ff7de17ac..870ecc70a4e7ffcd0795829545a546aa99a3387a 100644 (file)
--- a/inc/main/interfaces/result/class_SearchableResult.php
+++ b/inc/main/interfaces/result/class_SearchableResult.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Result\Search;
 // Import framework stuff
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Generic\FrameworkInterface;
+use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 /**
  * An interface for searchable results

diff --git a/inc/main/interfaces/result/class_UpdateableResult.php b/inc/main/interfaces/result/class_UpdateableResult.php
index 22a19c392abaf9d2955a62ab6518cdb4f50ac1da..4623d29be1b80fd9992eca2dc0e3013e21edbda7 100644 (file)
--- a/inc/main/interfaces/result/class_UpdateableResult.php
+++ b/inc/main/interfaces/result/class_UpdateableResult.php
@@ -1,6 +1,10 @@
 <?php
 // Own namespace
-namespace CoreFramework\Result;
+namespace CoreFramework\Result\Update;
+
+// Import framework stuff
+use CoreFramework\Criteria\Add\AddableCriteria;
+use CoreFramework\Criteria\Local\LocalUpdateCriteria;
 
 /**
  * An interface for searchable results