Continued:

- config entry for CompressorChannel expanded with namespace
- added "import" for same class
- it is a "middlware" class
- config entry for framework directory pointer expanded with namespace
- added "import" for FrameworkDirectory
- added "import" for DirectoryIterator (SPL)

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

diff --git a/inc/config.php b/inc/config.php
index 262c606d7147390cca95f9446556afe35bd8d831..b33f3d36bf20d545a7492ad0bd6b0318b2def838 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -341,7 +341,7 @@ $cfg->setConfigEntry('stacker_current_node_max_size', 20);
 $cfg->setConfigEntry('local_file_database_class', 'CoreFramework\Database\Backend\Lfdb\CachedLocalFileDatabase');
 
 // CFG: COMPRESSOR-CHANNEL-CLASS
-$cfg->setConfigEntry('compressor_channel_class', 'CompressorChannel');
+$cfg->setConfigEntry('compressor_channel_class', 'CoreFramework\Middleware\Compressor\CompressorChannel');
 
 // CFG: DEBUG-HTML-OUTPUT-TIMINGS
 $cfg->setConfigEntry('debug_html_output_timings', 'N');
@@ -371,7 +371,7 @@ $cfg->setConfigEntry('hostname_file', '/etc/hostname');
 $cfg->setConfigEntry('database_cache_enabled', FALSE);
 
 // CFG: DIRECTORY-CLASS
-$cfg->setConfigEntry('directory_class', 'FrameworkDirectoryPointer');
+$cfg->setConfigEntry('directory_class', 'CoreFramework\Filesytem\Pointer\FrameworkDirectoryPointer');
 
 // CFG: FILE-RAW-INPUT-CLASS
 $cfg->setConfigEntry('file_raw_input_class', 'FrameworkRawFileInputPointer');

diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index fdf7aab25be23390e3efccbfcc7ffb9580c7d51b..302057523e0011313ffc2bbc09afc2b45eaa6d5f 100644 (file)
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -9,11 +9,13 @@ use CoreFramework\Criteria\Criteria;
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Filesystem\FrameworkDirectory;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Handler\Stream\IoHandler;
 use CoreFramework\Loader\ClassLoader;
 use CoreFramework\Manager\ManageableApplication;
+use CoreFramework\Middleware\Compressor\CompressorChannel;
 use CoreFramework\Middleware\Debug\DebugMiddleware;
 use CoreFramework\Registry\Register;
 use CoreFramework\Registry\Registry;
@@ -1533,7 +1535,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        /**
         * Setter for FrameworkDirectory instance
         *
-        * @param       $directoryInstance      A FrameworkDirectoryPointer instance
+        * @param       $directoryInstance      A FrameworkDirectory instance
         * @return      void
         */
        protected final function setDirectoryInstance (FrameworkDirectory $directoryInstance) {

diff --git a/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php b/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
index b1e85730c79dedb7a34ecf7a79898568e1b58864..8bcb3ccfc839d71c9721c61380b38cc5b7f15fba 100644 (file)
--- a/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
+++ b/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
@@ -3,8 +3,12 @@
 namespace CoreFramework\Filesytem\Pointer;
 
 // Import framework stuff
+use CoreFramework\Filesystem\FrameworkDirectory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
+// Import SPL stuff
+use \DirectoryIterator;
+
 /**
  * A class for directory reading and getting its contents, no recursion!
  *

diff --git a/inc/main/middleware/compressor/class_CompressorChannel.php b/inc/main/middleware/compressor/class_CompressorChannel.php
index fe77ed389591f3677868ffbfe2ae21137f62fe1f..618e82f166183e48145d1cc63388c18457e62c1e 100644 (file)
--- a/inc/main/middleware/compressor/class_CompressorChannel.php
+++ b/inc/main/middleware/compressor/class_CompressorChannel.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Channel\Compressor;
+namespace CoreFramework\Middleware\Compressor;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;