Continued:

- added "import" of BaseUser, Updateable
- added "import" of ManageableAccount and ManageableMember
- fixed config entry, namespace added

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

diff --git a/framework/config.php b/framework/config.php
index 86af32de43602d831a24dbb6bd01739a0244d079..0ef0e206d983065fb41fa6732b8936a4b570ad7c 100644 (file)
--- a/framework/config.php
+++ b/framework/config.php
@@ -176,7 +176,7 @@ $cfg->setConfigEntry('search_criteria_class', 'CoreFramework\Criteria\Search\Sea
 $cfg->setConfigEntry('dataset_criteria_class', 'DataSetCriteria');
 
 // CFG: UPDATE-CRITERIA-CLASS
-$cfg->setConfigEntry('update_criteria_class', 'UpdateCriteria');
+$cfg->setConfigEntry('update_criteria_class', 'CoreFramework\Criteria\Update\UpdateCriteria');
 
 // CFG: FILE-IO-CLASS
 $cfg->setConfigEntry('file_io_class', 'CoreFramework\Handler\Filesystem\FileIoHandler');
@@ -296,7 +296,7 @@ $cfg->setConfigEntry('is_single_server', 'Y');
 $cfg->setConfigEntry('post_registration_class', 'LoginAfterRegistrationAction');
 
 // CFG: USER-CLASS
-$cfg->setConfigEntry('user_class', 'Member');
+$cfg->setConfigEntry('user_class', 'CoreFramework\User\Login\Member');
 
 // CFG: GUEST-CLASS
 $cfg->setConfigEntry('guest_class', 'Guest');
@@ -383,7 +383,7 @@ $cfg->setConfigEntry('file_raw_output_class', 'FrameworkRawFileOutputPointer');
 $cfg->setConfigEntry('file_raw_input_output_class', 'FrameworkFileInputOutputPointer');
 
 // CFG: TEXT-FILE-INPUT-CLASS
-$cfg->setConfigEntry('text_file_input_class', 'FrameworkTextFileInputPointer');
+$cfg->setConfigEntry('text_file_input_class', 'CoreFramework\Filesystem\Pointer\Input\FrameworkTextFileInputPointer');
 
 // CFG: CSV-INPUT-FILE-CLASS
 $cfg->setConfigEntry('csv_input_file_class', 'CsvInputFile');
@@ -407,16 +407,16 @@ $cfg->setConfigEntry('index_pre_allocate_enabled', 'Y');
 $cfg->setConfigEntry('index_pre_allocate_count', 10000);
 
 // CFG: STACK-FILE-CLASS
-$cfg->setConfigEntry('stack_file_class', 'StackFile');
+$cfg->setConfigEntry('stack_file_class', 'CoreFramework\Filesystem\Stack\StackFile');
 
 // CFG: INDEX-FILE-CLASS
 $cfg->setConfigEntry('index_file_class', 'IndexFile');
 
 // CFG: TASK-HANDLER-CLASS
-$cfg->setConfigEntry('task_handler_class', 'TaskHandler');
+$cfg->setConfigEntry('task_handler_class', 'CoreFramework\Handler\Task\TaskHandler');
 
 // CFG: TASK-LIST-CLASS
-$cfg->setConfigEntry('task_list_class', 'TaskList');
+$cfg->setConfigEntry('task_list_class', 'CoreFramework\List\Task\TaskList');
 
 // CFG: LIST-GROUP-CLASS
 $cfg->setConfigEntry('list_group_class', 'ListGroupList');

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 7185309257cc39270935f016fdd5ac9c99150785..16aa6d9b9a41c19234f11db41f97414ee17927eb 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -30,6 +30,7 @@ use CoreFramework\Result\Search\SearchableResult;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Stream\Output\OutputStreamer;
 use CoreFramework\Template\CompileableTemplate;
+use CoreFramework\User\ManageableAccount;
 use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 // Import SPL stuff

diff --git a/framework/main/classes/filter/auth/class_UserAuthFilter.php b/framework/main/classes/filter/auth/class_UserAuthFilter.php
index 163fd3b157de2246ef3c022df28c5f8cfe21e7ba..63bcc49c3f58572d27062ea8fbc38e0e5a85c3f9 100644 (file)
--- a/framework/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/framework/main/classes/filter/auth/class_UserAuthFilter.php
@@ -10,6 +10,7 @@ use CoreFramework\Loader\NoClassException;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
+use CoreFramework\User\BaseUser;
 
 /**
  * A filter for checking user permissions

diff --git a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
index cf4f41d7b7a8acac4c36558e2c2f442f37350c34..5b2cc16d062544e0d3b1459149305a9ce9bd299a 100644 (file)
--- a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -9,6 +9,7 @@ use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
+use CoreFramework\User\BaseUser;
 
 /**
  * A concrete filter for validating the password. This filter may intercept

diff --git a/framework/main/classes/mailer/class_BaseMailer.php b/framework/main/classes/mailer/class_BaseMailer.php
index b137e5ff628d4c66294bf4ffd1b9524964470b89..0f4d7789a972a41ac7973dcfb9d58b27d6e7ee1b 100644 (file)
--- a/framework/main/classes/mailer/class_BaseMailer.php
+++ b/framework/main/classes/mailer/class_BaseMailer.php
@@ -3,8 +3,9 @@
 namespace CoreFramework\Mailer;
 
 // Import framework stuff
-use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Generic\FrameworkInterface;
+use CoreFramework\Manager\Login\ManageableMember;
+use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * A general mailer class for all other mailers

diff --git a/framework/main/classes/mailer/debug/class_DebugMailer.php b/framework/main/classes/mailer/debug/class_DebugMailer.php
index fefa2800214ce7c76e5b5b3e9ada135bfb5ab499..93c4a1f4da7bf87c3c8980fcc378293695751e2f 100644 (file)
--- a/framework/main/classes/mailer/debug/class_DebugMailer.php
+++ b/framework/main/classes/mailer/debug/class_DebugMailer.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Mailer\Debug;
 
 // Import framework stuff
 use CoreFramework\Generic\NullPointerException;
+use CoreFramework\Manager\Login\ManageableMember;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Template\CompileableTemplate;
 

diff --git a/framework/main/classes/points/class_UserPoints.php b/framework/main/classes/points/class_UserPoints.php
index 0961a489cb81d5dd5710ab91477c43dec50f2f97..723fca00d7ac6d1774990f5ff59df9dd65f560fc 100644 (file)
--- a/framework/main/classes/points/class_UserPoints.php
+++ b/framework/main/classes/points/class_UserPoints.php
@@ -9,6 +9,7 @@ use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Request\Requestable;
+use CoreFramework\User\ManageableAccount;
 
 /**
  * A class for handling user points which can be real or Internet currency

diff --git a/framework/main/classes/user/class_BaseUser.php b/framework/main/classes/user/class_BaseUser.php
index 58d0850aeceda931532a5b64b6b0424eeac357f8..f8b945f9e704e01ea02ddc17ad9bcec4a0f39eaa 100644 (file)
--- a/framework/main/classes/user/class_BaseUser.php
+++ b/framework/main/classes/user/class_BaseUser.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\User;
 
 // Import framework stuff
+use CoreFramework\Database\Updateable;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Request\Requestable;

diff --git a/framework/main/classes/user/guest/class_Guest.php b/framework/main/classes/user/guest/class_Guest.php
index 91a788ee68d237c5a7000cb9268739b76b629c90..1b6fe579a5cf627a9ac8529cc41dd6abb9414858 100644 (file)
--- a/framework/main/classes/user/guest/class_Guest.php
+++ b/framework/main/classes/user/guest/class_Guest.php
@@ -5,6 +5,7 @@ namespace CoreFramework\User\Guest;
 // Import framework stuff
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Request\Requestable;
+use CoreFramework\User\BaseUser;
 
 /**
  * A generic class for handling guests

diff --git a/framework/main/classes/user/member/class_Member.php b/framework/main/classes/user/member/class_Member.php
index 6d7e184974bd2ddc0000395a824bd6bd23922122..088a965a844cb99a4cf7701eddb7247b6cdde48a 100644 (file)
--- a/framework/main/classes/user/member/class_Member.php
+++ b/framework/main/classes/user/member/class_Member.php
@@ -4,7 +4,9 @@ namespace CoreFramework\User\Login;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Manager\Login\ManageableMember;
 use CoreFramework\Registry\Registerable;
+use CoreFramework\User\BaseUser;
 use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
 
 /**

diff --git a/framework/main/interfaces/mailer/class_DeliverableMail.php b/framework/main/interfaces/mailer/class_DeliverableMail.php
index 144b977dccafacd3acf5fe05bb13144c0bdd6987..b4a3307992b6ede4091a1e981e1803f5172c88b5 100644 (file)
--- a/framework/main/interfaces/mailer/class_DeliverableMail.php
+++ b/framework/main/interfaces/mailer/class_DeliverableMail.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Mailer;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
+use CoreFramework\Manager\Login\ManageableMember;
 
 /**
  * An interface for deliverable mail aka. mailer classes

diff --git a/framework/main/interfaces/user/extended/class_ManageableGuest.php b/framework/main/interfaces/user/extended/class_ManageableGuest.php
index 75c11c6f011f19f4c7035d91f53acb8c3789e905..a82198a2cc005121ade5e00777ca019312d0a52b 100644 (file)
--- a/framework/main/interfaces/user/extended/class_ManageableGuest.php
+++ b/framework/main/interfaces/user/extended/class_ManageableGuest.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Manager\Guest;
 
+// Import framework stuff
+use CoreFramework\User\ManageableAccount;
+
 /**
  * An interface for manageable guests
  *

diff --git a/framework/main/interfaces/user/extended/class_ManageableMember.php b/framework/main/interfaces/user/extended/class_ManageableMember.php
index 3095c243cdb15472b73c27193ae34d3a268870de..1b3e4697824006f8d3b6047be1ca84600e953c7f 100644 (file)
--- a/framework/main/interfaces/user/extended/class_ManageableMember.php
+++ b/framework/main/interfaces/user/extended/class_ManageableMember.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Manager\Login;
 
+// Import framework stuff
+use CoreFramework\User\ManageableAccount;
+
 /**
  * An interface for manageable users
  *