From: Roland Haeder Date: Sat, 25 Feb 2017 16:10:57 +0000 (+0100) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c29c7208dc27ea0d088aa1f232713775c007ce5;p=core.git 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 --- diff --git a/inc/config.php b/inc/config.php index 262c606d..b33f3d36 100644 --- 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 fdf7aab2..30205752 100644 --- 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 b1e85730..8bcb3ccf 100644 --- 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 fe77ed38..618e82f1 100644 --- a/inc/main/middleware/compressor/class_CompressorChannel.php +++ b/inc/main/middleware/compressor/class_CompressorChannel.php @@ -1,6 +1,6 @@