From 9a24d448d6d5ed4a3d67997914272744f20aa7ef Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 25 Feb 2017 18:10:50 +0100 Subject: [PATCH] Continued: - added "import" of DatabaseWrapper - added "import" of AddableCriteria - added "import" of UpdateableResult - added "import" of LocalUpdateCriteria - added missing namespace MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/main/classes/class_BaseFrameworkSystem.php | 4 +++- inc/main/classes/criteria/update/class_UpdateCriteria.php | 1 + .../classes/database/frontend/class_UserDatabaseWrapper.php | 1 + .../classes/database/result/class_CachedDatabaseResult.php | 3 +++ inc/main/exceptions/result/class_ResultUpdateException.php | 1 + .../interfaces/criteria/extended/class_AddableCriteria.php | 2 +- .../database/wrapper/class_BookablePointsWrapper.php | 4 ++++ .../database/wrapper/class_ManageableAccountWrapper.php | 6 ++++++ inc/main/interfaces/points/class_BookablePoints.php | 3 +++ inc/main/interfaces/registration/class_UserRegister.php | 3 +++ inc/main/interfaces/result/class_SearchableResult.php | 1 + inc/main/interfaces/result/class_UpdateableResult.php | 6 +++++- 12 files changed, 32 insertions(+), 3 deletions(-) diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php index e4c03668..3ca59ca3 100644 --- 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 c65224cd..2ada2e55 100644 --- 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 1e83aefe..0e74d864 100644 --- 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 40b2c3cd..53109101 100644 --- 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 f480ce9a..b5617fe2 100644 --- 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 fbc9fc4f..193fa7a9 100644 --- a/inc/main/interfaces/criteria/extended/class_AddableCriteria.php +++ b/inc/main/interfaces/criteria/extended/class_AddableCriteria.php @@ -1,6 +1,6 @@