Continued:

- added namespace to class config entries
- added "import" of CryptoHelper and Cryptable
- added "import" of Cacheable
- fixed tpzo in namespace

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

diff --git a/framework/config.php b/framework/config.php
index 90517550700d2342e01208c7e5b977bfdda4f7e8..28803fefffb8493b858d8cacfa188ebfd35158c0 100644 (file)
--- 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('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');
 
 // 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('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');
 
 // 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('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');
 
 // 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('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');
 
 // 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 fb926f431fc18e4e08fc415b806a546b6df382d4..c23851ee86d6310eaf3b8a6c0b49bc8c904e4a8f 100644 (file)
--- a/framework/main/classes/cache/class_MemoryCache.php
+++ b/framework/main/classes/cache/class_MemoryCache.php
@@ -1,8 +1,9 @@
 <?php
 // Own namespace
 <?php
 // Own namespace

-namespace CoreFramework\Cache;
+namespace CoreFramework\Cache\Memory;

 
 // Import framework stuff
 
 // Import framework stuff

+use CoreFramework\Cache\Cacheable;

 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 2c0d7db0767c7a1b0ab0bc2ad8a0e9702bad1138..1df10748737ad3452a8c628772fee41d2f206030 100644 (file)
--- 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\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;
 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 153f4d4f781daacb89c535f6cf5b73e8db031ff2..9a31a2691de9604f22b30bd3a48771497c846885 100644 (file)
--- 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
 namespace CoreFramework\Helper\Crypto;
 
 // Import framework stuff

+use CoreFramework\Crypto\Cryptable;

 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 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 285b764e737fa6c3ca9b3378d15346aa9ff91e80..b2eb002b0ad51ca31c22c34ddb1c7c3dcd8089fa 100644 (file)
--- 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\Factory\ObjectFactory;
 use CoreFramework\Filter\BaseFilter;
 use CoreFramework\Filter\Filterable;

+use CoreFramework\Helper\Crypto\CryptoHelper;

 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
 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 c667d3bfa9bcb7077da9a9768645cfa53d9aae38..441663f6335258425b764acdf4adcc237eab27fd 100644 (file)
--- a/framework/main/interfaces/crypto/class_Cryptable.php
+++ b/framework/main/interfaces/crypto/class_Cryptable.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
 <?php
 // Own namespace

-namespace CoreFramework\Cryto;
+namespace CoreFramework\Crypto;

 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;