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

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

diff --git a/framework/config.php b/framework/config.php
index 0ef0e206d983065fb41fa6732b8936a4b570ad7c..20e6744b16c99401da93f2dece06308996f5b364 100644 (file)
--- 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 41287ab05db2d2bc6cf107e5ae8a63004a440bab..ba156fffaff68a137c6de05d676b0ed50bf1358a 100644 (file)
--- 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 09781562c632f431b00caf77f159826ae3d471e9..a75f0ec4e628ac971a36fee7f1f129717e98e38e 100644 (file)
--- 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 2b2704e28312ec2e63e24578ce128c5eedd0c8f2..5347f34d223da5a0028bcea0b3c7669aa0761d58 100644 (file)
--- 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 d7f8ef742b3d6af8775f79321df6933fe8e0700b..ee070c7c570d0cc8df7339147d4a7055085c7d20 100644 (file)
--- 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 98782b961172e0c7678ba8aecd77a3e1d39e36ca..d54966d83ca4beebd26ed5d012ac14d9e7ead30f 100644 (file)
--- 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 1d3ae08bd65ec2a6853af6b2aa435cf975e75932..6f95ccdfe869d9829b45b8d8f5d89757b34e9a69 100644 (file)
--- 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 34ddc5b158f9d8e92a5c7c07840147786dc3b87e..9d8eb33050a423a72f8ea4956b605b192ac0d68f 100644 (file)
--- 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 d075a4ef442f9e9f81ccec5174d10cf39bce4602..f48cc66b645a937e32be86d55f0604b49edba155 100644 (file)
--- 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 4c32332c9ad4c6a803ab6610375874a1e114aa93..eadf742ea56040f1fb511594b0099066ea69be48 100644 (file)
--- 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 096f72c870184ffe7611cb8850c81b7aaaf88d2f..7e9e7229bda5c4b2aaf4b70d4cdf0576f218c04b 100644 (file)
--- a/framework/main/classes/lists/groups/class_ListGroupList.php
+++ b/framework/main/classes/lists/groups/class_ListGroupList.php
@@ -1,6 +1,10 @@
 <?php
 // Own namespace
-namespace CoreFramework\List\Group;
+namespace CoreFramework\Lists\Group;
+
+// Import framework stuff
+use CoreFramework\Lists\BaseList;
+use CoreFramework\Lists\Listable;
 
 /**
  * A ListGroup list

diff --git a/framework/main/classes/lists/tasks/class_TaskList.php b/framework/main/classes/lists/tasks/class_TaskList.php
index c868cd51fd66878d0f47ba1c9f3ceace7a3e9a92..bfdaf0bc3c8b110600f802d64b7face0e703ebf4 100644 (file)
--- a/framework/main/classes/lists/tasks/class_TaskList.php
+++ b/framework/main/classes/lists/tasks/class_TaskList.php
@@ -1,6 +1,10 @@
 <?php
 // Own namespace
-namespace CoreFramework\List\Task;
+namespace CoreFramework\Lists\Task;
+
+// Import framework stuff
+use CoreFramework\Lists\BaseList;
+use CoreFramework\Lists\Listable;
 
 /**
  * A Task list

diff --git a/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php b/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
index 95c35166e62a5a493b8137910e040b085f2b3c22..f97063322401d195dc6a7de20e88e4b0fceafd1a 100644 (file)
--- a/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
+++ b/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
@@ -2,6 +2,10 @@
 // Own namespace
 namespace CoreFramework\Filesystem\Pointer;
 
+// Import framework stuff
+use CoreFramework\Filesystem\Pointer\InputPointer;
+use CoreFramework\Filesystem\Pointer\OutputPointer;
+
 /**
  * An interface for (mostly) file input/output pointers.
  *

diff --git a/framework/main/interfaces/lists/class_Listable.php b/framework/main/interfaces/lists/class_Listable.php
index 0d96e791e773230417d3ebd6c4f4cb45623a64b7..251474505041d5bac3e0cbe633f7be0410a64cc0 100644 (file)
--- a/framework/main/interfaces/lists/class_Listable.php
+++ b/framework/main/interfaces/lists/class_Listable.php
@@ -5,6 +5,9 @@ namespace CoreFramework\Lists;
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
+// Import SPL stuff
+use \IteratorAggregate;
+
 /**
  * An interface for lists
  *