From 4d138b9dc7867c7d681c8c0cfc57f4d07a348ee1 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 26 Feb 2017 22:19:53 +0100 Subject: [PATCH] Continued: - added namespace to class config entries - added "import" of LanguageSystem - added "import" of BaseTask (and in class template, too) - added "import" of Visitable - added "import" of ManageableGuest - added "import" of BaseIndex, Indexable and IndexableStack - added "import" of CalculatableBlock - and no "we", better neutral words MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- framework/config.php | 20 +++++++++---------- .../classes/class_BaseFrameworkSystem.php | 1 + .../index/class_FileStackIndexFactory.php | 1 + .../binary/class_BaseBinaryFile.php | 1 + .../handler/tasks/class_TaskHandler.php | 3 ++- framework/main/classes/index/class_ | 7 +++++++ .../index/file_stack/class_FileStackIndex.php | 3 +++ .../classes/listener/class_BaseListener.php | 1 + .../listener/class_BaseListenerDecorator.php | 1 + .../main/classes/lists/class_BaseList.php | 1 + .../stacker/file/fifo/class_FiFoFileStack.php | 1 + framework/main/classes/tasks/class_ | 9 +++++++++ .../classes/tasks/idle/class_IdleLoopTask.php | 2 ++ .../main/classes/user/guest/class_Guest.php | 1 + .../handler/task/class_HandleableTask.php | 1 + .../main/interfaces/index/class_Indexable | 6 ++++++ .../index/stack/class_IndexableStack.php | 4 ++++ .../main/interfaces/lists/class_Listable.php | 1 + index.php | 1 + 19 files changed, 54 insertions(+), 11 deletions(-) diff --git a/framework/config.php b/framework/config.php index 2d9cd8e7..c0afdd57 100644 --- a/framework/config.php +++ b/framework/config.php @@ -128,7 +128,7 @@ $cfg->setConfigEntry('menu_template_type', 'menu'); $cfg->setConfigEntry('output_class', 'CoreFramework\Output\WebOutput'); // CFG: LANGUAGE-SYSTEM-CLASS -$cfg->setConfigEntry('language_system_class', 'LanguageSystem'); +$cfg->setConfigEntry('language_system_class', 'CoreFramework\Localization\LanguageSystem'); // CFG: SELECTOR-TEMPLATE-PREFIX $cfg->setConfigEntry('tpl_selector_prefix', 'selector'); @@ -251,16 +251,16 @@ $cfg->setConfigEntry('user_db_wrapper_class', 'CoreFramework\Wrapper\Database\Us $cfg->setConfigEntry('news_db_wrapper_class', 'CoreFramework\Wrapper\Database\News\NewsDatabaseWrapper'); // CFG: HTML-CMD-RESOLVER-CLASS -$cfg->setConfigEntry('html_cmd_resolver_class', 'HtmlCommandResolver'); +$cfg->setConfigEntry('html_cmd_resolver_class', 'CoreFramework\Resolver\Command\HtmlCommandResolver'); // CFG: HTML-CMD-LOGIN-RESOLVER-CLASS -$cfg->setConfigEntry('html_cmd_login_resolver_class', 'HtmlCommandResolver'); +$cfg->setConfigEntry('html_cmd_login_resolver_class', 'CoreFramework\Resolver\Command\HtmlCommandResolver'); // CFG: IMAGE-CMD-RESOLVER-CLASS -$cfg->setConfigEntry('image_cmd_resolver_class', 'ImageCommandResolver'); +$cfg->setConfigEntry('image_cmd_resolver_class', 'CoreFramework\Resolver\Command\ImageCommandResolver'); // CFG: IMAGE-CMD-CODE-CAPTCHA-RESOLVER-CLASS -$cfg->setConfigEntry('image_cmd_code_captcha_resolver_class', 'ImageCommandResolver'); +$cfg->setConfigEntry('image_cmd_code_captcha_resolver_class', 'CoreFramework\Resolver\Command\ImageCommandResolver'); // CFG: MAILER-CLASS $cfg->setConfigEntry('mailer_class', 'CoreFramework\Mailer\Debug\DebugMailer'); @@ -299,7 +299,7 @@ $cfg->setConfigEntry('post_registration_class', 'CoreFramework\Action\PostRegist $cfg->setConfigEntry('user_class', 'CoreFramework\User\Login\Member'); // CFG: GUEST-CLASS -$cfg->setConfigEntry('guest_class', 'Guest'); +$cfg->setConfigEntry('guest_class', 'CoreFramework\User\Guest\Guest'); // CFG: COOKIE-EXPIRE $cfg->setConfigEntry('cookie_expire', (60*60*2)); // Two hours! @@ -398,7 +398,7 @@ $cfg->setConfigEntry('file_stack_pre_allocate_enabled', 'Y'); $cfg->setConfigEntry('file_stack_pre_allocate_count', 10000); // CFG: INDEX-INDEX-CLASS -$cfg->setConfigEntry('file_stack_index_class', 'FileStackIndex'); +$cfg->setConfigEntry('file_stack_index_class', 'CoreFramework\Index\Stack\FileStackIndex'); // CFG: INDEX-PRE-ALLOCATE-ENABLED $cfg->setConfigEntry('index_pre_allocate_enabled', 'Y'); @@ -410,7 +410,7 @@ $cfg->setConfigEntry('index_pre_allocate_count', 10000); $cfg->setConfigEntry('stack_file_class', 'CoreFramework\Filesystem\Stack\StackFile'); // CFG: INDEX-FILE-CLASS -$cfg->setConfigEntry('index_file_class', 'IndexFile'); +$cfg->setConfigEntry('index_file_class', 'CoreFramework\Filesystem\Index\IndexFile'); // CFG: TASK-HANDLER-CLASS $cfg->setConfigEntry('task_handler_class', 'CoreFramework\Handler\Task\TaskHandler'); @@ -419,7 +419,7 @@ $cfg->setConfigEntry('task_handler_class', 'CoreFramework\Handler\Task\TaskHandl $cfg->setConfigEntry('task_list_class', 'CoreFramework\Lists\Task\TaskList'); // CFG: LIST-GROUP-CLASS -$cfg->setConfigEntry('list_group_class', 'ListGroupList'); +$cfg->setConfigEntry('list_group_class', 'CoreFramework\Lists\Group\ListGroupList'); // CFG: DEFAULT-ITERATOR-CLASS $cfg->setConfigEntry('default_iterator_class', 'DefaultIterator'); @@ -428,7 +428,7 @@ $cfg->setConfigEntry('default_iterator_class', 'DefaultIterator'); $cfg->setConfigEntry('active_task_visitor_class', 'ActiveTaskVisitor'); // CFG: IDLE-TASK-CLASS -$cfg->setConfigEntry('idle_task_class', 'IdleLoopTask'); +$cfg->setConfigEntry('idle_task_class', 'CoreFramework\Task\IdleLoop\IdleLoopTask'); // CFG: TASK-IDLE-LOOP-STARTUP-DELAY $cfg->setConfigEntry('task_idle_loop_startup_delay', 0); diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php index b15d4362..6424b788 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -19,6 +19,7 @@ use CoreFramework\Filesystem\FrameworkDirectory; use CoreFramework\Generic\FrameworkInterface; use CoreFramework\Generic\NullPointerException; use CoreFramework\Handler\Stream\IoHandler; +use CoreFramework\Index\Indexable; use CoreFramework\Listener\Listenable; use CoreFramework\Lists\Listable; use CoreFramework\Loader\ClassLoader; diff --git a/framework/main/classes/factories/index/class_FileStackIndexFactory.php b/framework/main/classes/factories/index/class_FileStackIndexFactory.php index 612bf52b..f4594997 100644 --- a/framework/main/classes/factories/index/class_FileStackIndexFactory.php +++ b/framework/main/classes/factories/index/class_FileStackIndexFactory.php @@ -5,6 +5,7 @@ namespace CoreFramework\Factory\Filesystem\Stack; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Registry; +use CoreFramework\Stack\Index\IndexableStack; /** * A factory class for file-based stack indexes diff --git a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php index f89e0aaf..fc4140cd 100644 --- a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php +++ b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php @@ -5,6 +5,7 @@ namespace CoreFramework\Filesystem\File; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Filesystem\Block; +use CoreFramework\Filesystem\Block\CalculatableBlock; /** * A general binary file class diff --git a/framework/main/classes/handler/tasks/class_TaskHandler.php b/framework/main/classes/handler/tasks/class_TaskHandler.php index 82a664fe..b0fd9444 100644 --- a/framework/main/classes/handler/tasks/class_TaskHandler.php +++ b/framework/main/classes/handler/tasks/class_TaskHandler.php @@ -8,6 +8,7 @@ use CoreFramework\Handler\BaseHandler; use CoreFramework\Lists\Listable; use CoreFramework\Registry\Registerable; use CoreFramework\Task\Taskable; +use CoreFramework\Visitor\Visitable; /** * A Task handler @@ -220,7 +221,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask { * Registers a task with a task handler. * * @param $taskName A task name to register the task on - * @param $taskInstance The instance we should register as a task + * @param $taskInstance The instance that should be registered as a task * @return void */ public function registerTask ($taskName, Visitable $taskInstance) { diff --git a/framework/main/classes/index/class_ b/framework/main/classes/index/class_ index b74ed32a..374cb977 100644 --- a/framework/main/classes/index/class_ +++ b/framework/main/classes/index/class_ @@ -1,4 +1,11 @@