From e4c8bbae5064bfc7a32608e7f12a6428bf42cf28 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 28 Feb 2017 21:40:21 +0100
Subject: [PATCH] Continued: - added namespace to class config entries - added
 "import" of CryptoHelper and Cryptable - added "import" of Cacheable - fixed
 tpzo in namespace
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 framework/config.php                                      | 8 ++++----
 framework/main/classes/cache/class_MemoryCache.php        | 3 ++-
 framework/main/classes/class_BaseFrameworkSystem.php      | 1 +
 framework/main/classes/crypto/class_CryptoHelper.php      | 1 +
 .../classes/filter/crypto/class_CaptchaEncryptFilter.php  | 1 +
 framework/main/interfaces/crypto/class_Cryptable.php      | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/framework/config.php b/framework/config.php
index 90517550..28803fef 100644
--- a/framework/config.php
+++ b/framework/config.php
@@ -167,7 +167,7 @@ $cfg->setConfigEntry('default_application', 'selector');
 $cfg->setConfigEntry('verbose_level', 0);
 
 // CFG: CACHE-CLASS
-$cfg->setConfigEntry('cache_class', 'MemoryCache');
+$cfg->setConfigEntry('cache_class', 'CoreFramework\Cache\Memory\MemoryCache');
 
 // CFG: SEARCH-CRITERIA-CLASS
 $cfg->setConfigEntry('search_criteria_class', 'CoreFramework\Criteria\Search\SearchCriteria');
@@ -230,7 +230,7 @@ $cfg->setConfigEntry('email_change_filter_class', 'CoreFramework\Filter\Change\E
 $cfg->setConfigEntry('password_change_filter_class', 'CoreFramework\Filter\Change\Password\PasswordChangeFilter');
 
 // CFG: ACCOUNT-PASSWORD-FILTER-CLASS
-$cfg->setConfigEntry('account_password_filter_class', 'AccountPasswordVerifierFilter');
+$cfg->setConfigEntry('account_password_filter_class', 'CoreFramework\Filter\Verifier\Password\AccountPasswordVerifierFilter');
 
 // CFG: USER-STATUS-FILTER-CLASS
 $cfg->setConfigEntry('user_status_filter_class', 'CoreFramework\Filter\Verifier\User\UserStatusVerifierFilter');
@@ -239,7 +239,7 @@ $cfg->setConfigEntry('user_status_filter_class', 'CoreFramework\Filter\Verifier\
 $cfg->setConfigEntry('user_unconfirmed_filter_class', 'CoreFramework\Filter\Verifier\User\UserUnconfirmedVerifierFilter');
 
 // CFG: CRYPTO-CLASS
-$cfg->setConfigEntry('crypto_class', 'CryptoHelper');
+$cfg->setConfigEntry('crypto_class', 'CoreFramework\Helper\Crypto\CryptoHelper');
 
 // CFG: RNG-CLASS
 $cfg->setConfigEntry('rng_class', 'CoreFramework\Crypto\RandomNumber\RandomNumberGenerator');
@@ -425,7 +425,7 @@ $cfg->setConfigEntry('list_group_class', 'CoreFramework\Lists\Group\ListGroupLis
 $cfg->setConfigEntry('default_iterator_class', 'CoreFramework\Iterator\DefaultIterator');
 
 // CFG: ACTIVE-TASK-VISITOR-CLASS
-$cfg->setConfigEntry('active_task_visitor_class', 'ActiveTaskVisitor');
+$cfg->setConfigEntry('active_task_visitor_class', 'CoreFramework\Visitor\Task\Active\ActiveTaskVisitor');
 
 // CFG: IDLE-TASK-CLASS
 $cfg->setConfigEntry('idle_task_class', 'CoreFramework\Task\IdleLoop\IdleLoopTask');
diff --git a/framework/main/classes/cache/class_MemoryCache.php b/framework/main/classes/cache/class_MemoryCache.php
index fb926f43..c23851ee 100644
--- a/framework/main/classes/cache/class_MemoryCache.php
+++ b/framework/main/classes/cache/class_MemoryCache.php
@@ -1,8 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Cache;
+namespace CoreFramework\Cache\Memory;
 
 // Import framework stuff
+use CoreFramework\Cache\Cacheable;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 2c0d7db0..1df10748 100644
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -10,6 +10,7 @@ use CoreFramework\Controller\Controller;
 use CoreFramework\Criteria\Criteria;
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Criteria\Local\LocalUpdateCriteria;
+use CoreFramework\Crypto\Cryptable;
 use CoreFramework\Crypto\RandomNumber\RandomNumberGenerator;
 use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
diff --git a/framework/main/classes/crypto/class_CryptoHelper.php b/framework/main/classes/crypto/class_CryptoHelper.php
index 153f4d4f..9a31a269 100644
--- a/framework/main/classes/crypto/class_CryptoHelper.php
+++ b/framework/main/classes/crypto/class_CryptoHelper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Helper\Crypto;
 
 // Import framework stuff
+use CoreFramework\Crypto\Cryptable;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
diff --git a/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php b/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
index 285b764e..b2eb002b 100644
--- a/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
+++ b/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Filter\Captcha;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\BaseFilter;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Helper\Crypto\CryptoHelper;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/framework/main/interfaces/crypto/class_Cryptable.php b/framework/main/interfaces/crypto/class_Cryptable.php
index c667d3bf..441663f6 100644
--- a/framework/main/interfaces/crypto/class_Cryptable.php
+++ b/framework/main/interfaces/crypto/class_Cryptable.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Cryto;
+namespace CoreFramework\Crypto;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
-- 
2.30.2