From 515b61f538c641f6e16d908767bcfdb18f889318 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 26 Feb 2017 20:46:05 +0100 Subject: [PATCH] Continued: - it cannot be "List" as this is reserved (list() command), so take "Lists" - added "import" of IteratorAggregate and Countable (both SPL) - added "import" of BaseList and Listable - added "import" of BaseFileIo, InputPointer and OutputPointer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- framework/config.php | 2 +- framework/main/classes/class_BaseFrameworkSystem.php | 1 + .../input/raw/class_FrameworkRawFileInputPointer.php | 2 ++ .../input/text/class_FrameworkTextFileInputPointer.php | 2 ++ .../io/class_FrameworkFileInputOutputPointer.php | 1 + .../output/raw/class_FrameworkRawFileOutputPointer.php | 2 ++ .../output/text/class_FrameworkTextFileOutputPointer.php | 2 ++ framework/main/classes/handler/tasks/class_TaskHandler.php | 1 + .../main/classes/iterator/default/class_DefaultIterator.php | 3 +++ framework/main/classes/lists/class_BaseList.php | 4 ++++ framework/main/classes/lists/groups/class_ListGroupList.php | 6 +++++- framework/main/classes/lists/tasks/class_TaskList.php | 6 +++++- .../interfaces/io/pointer/io/class_InputOutputPointer.php | 4 ++++ framework/main/interfaces/lists/class_Listable.php | 3 +++ 14 files changed, 36 insertions(+), 3 deletions(-) diff --git a/framework/config.php b/framework/config.php index 0ef0e206..20e6744b 100644 --- a/framework/config.php +++ b/framework/config.php @@ -416,7 +416,7 @@ $cfg->setConfigEntry('index_file_class', 'IndexFile'); $cfg->setConfigEntry('task_handler_class', 'CoreFramework\Handler\Task\TaskHandler'); // CFG: TASK-LIST-CLASS -$cfg->setConfigEntry('task_list_class', 'CoreFramework\List\Task\TaskList'); +$cfg->setConfigEntry('task_list_class', 'CoreFramework\Lists\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 41287ab0..ba156fff 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -18,6 +18,7 @@ use CoreFramework\Filesystem\FrameworkDirectory; use CoreFramework\Generic\FrameworkInterface; use CoreFramework\Generic\NullPointerException; use CoreFramework\Handler\Stream\IoHandler; +use CoreFramework\Lists\Listable; use CoreFramework\Loader\ClassLoader; use CoreFramework\Manager\ManageableApplication; use CoreFramework\Middleware\Compressor\CompressorChannel; diff --git a/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php b/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php index 09781562..a75f0ec4 100644 --- a/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php +++ b/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php @@ -3,6 +3,8 @@ namespace CoreFramework\Filesystem\Pointer\Input; // Import framework stuff +use CoreFramework\FileSystem\BaseFileIo; +use CoreFramework\Filesystem\Pointer\InputPointer; use CoreFramework\Generic\NullPointerException; use CoreFramework\Object\BaseFrameworkSystem; diff --git a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php index 2b2704e2..5347f34d 100644 --- a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php +++ b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php @@ -3,6 +3,8 @@ namespace CoreFramework\Filesystem\Pointer\Input; // Import framework stuff +use CoreFramework\FileSystem\BaseFileIo; +use CoreFramework\Filesystem\Pointer\InputPointer; use CoreFramework\Generic\NullPointerException; use CoreFramework\Object\BaseFrameworkSystem; diff --git a/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php b/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php index d7f8ef74..ee070c7c 100644 --- a/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php +++ b/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php @@ -3,6 +3,7 @@ namespace CoreFramework\Filesystem\Pointer; // Import framework stuff +use CoreFramework\FileSystem\BaseFileIo; use CoreFramework\Generic\NullPointerException; use CoreFramework\Object\BaseFrameworkSystem; diff --git a/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php b/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php index 98782b96..d54966d8 100644 --- a/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php +++ b/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php @@ -3,6 +3,8 @@ namespace CoreFramework\Filesystem\Pointer\Raw; // Import framework stuff +use CoreFramework\FileSystem\BaseFileIo; +use CoreFramework\Filesystem\Pointer\OutputPointer; use CoreFramework\Generic\NullPointerException; /** diff --git a/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php b/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php index 1d3ae08b..6f95ccdf 100644 --- a/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php +++ b/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php @@ -3,6 +3,8 @@ namespace CoreFramework\Filesystem\Pointer\Text; // Import framework stuff +use CoreFramework\FileSystem\BaseFileIo; +use CoreFramework\Filesystem\Pointer\OutputPointer; use CoreFramework\Generic\NullPointerException; /** diff --git a/framework/main/classes/handler/tasks/class_TaskHandler.php b/framework/main/classes/handler/tasks/class_TaskHandler.php index 34ddc5b1..9d8eb330 100644 --- a/framework/main/classes/handler/tasks/class_TaskHandler.php +++ b/framework/main/classes/handler/tasks/class_TaskHandler.php @@ -5,6 +5,7 @@ namespace CoreFramework\Handler\Task; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Handler\BaseHandler; +use CoreFramework\Lists\Listable; use CoreFramework\Registry\Registerable; /** diff --git a/framework/main/classes/iterator/default/class_DefaultIterator.php b/framework/main/classes/iterator/default/class_DefaultIterator.php index d075a4ef..f48cc66b 100644 --- a/framework/main/classes/iterator/default/class_DefaultIterator.php +++ b/framework/main/classes/iterator/default/class_DefaultIterator.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Iterator; +// Import framework stuff +use CoreFramework\Lists\Listable; + /** * A Default iterator * diff --git a/framework/main/classes/lists/class_BaseList.php b/framework/main/classes/lists/class_BaseList.php index 4c32332c..eadf742e 100644 --- a/framework/main/classes/lists/class_BaseList.php +++ b/framework/main/classes/lists/class_BaseList.php @@ -7,6 +7,10 @@ use CoreFramework\Factory\ObjectFactory; use CoreFramework\Generic\FrameworkInterface; use CoreFramework\Object\BaseFrameworkSystem; +// Import SPL stuff +use \IteratorAggregate; +use \Countable; + /** * A general list class * diff --git a/framework/main/classes/lists/groups/class_ListGroupList.php b/framework/main/classes/lists/groups/class_ListGroupList.php index 096f72c8..7e9e7229 100644 --- a/framework/main/classes/lists/groups/class_ListGroupList.php +++ b/framework/main/classes/lists/groups/class_ListGroupList.php @@ -1,6 +1,10 @@