X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fmiddleware%2Fcompressor%2Fclass_CompressorChannel.php;h=26f702cf41cc01cdf39f38b0ab73cd8c8cc2a84c;hb=2218902056efcf9a2c66fe7c24995e066bd7cd11;hp=8ec776d9c935ac8ff3c0d883540d1d0a94867606;hpb=4f9cf34b521892cb99fae9b21b92787f3d555b74;p=core.git diff --git a/framework/main/middleware/compressor/class_CompressorChannel.php b/framework/main/middleware/compressor/class_CompressorChannel.php index 8ec776d9..26f702cf 100644 --- a/framework/main/middleware/compressor/class_CompressorChannel.php +++ b/framework/main/middleware/compressor/class_CompressorChannel.php @@ -3,8 +3,9 @@ namespace Org\Mxchange\CoreFramework\Middleware\Compressor; // Import framework stuff +use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Compressor\Compressor; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Middleware\BaseMiddleware; use Org\Mxchange\CoreFramework\Registry\Registerable; @@ -13,7 +14,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -62,8 +63,8 @@ class CompressorChannel extends BaseMiddleware implements Registerable { ) { // Init base directory $baseDir = - $compressorInstance->getConfigInstance()->getConfigEntry('framework_base_path') . - $compressorInstance->getConfigInstance()->getConfigEntry('compressor_base_path'); + FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('framework_base_path') . + FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('compressor_base_path'); // Get a directory pointer $directoryInstance = ObjectFactory::createObjectByConfiguredName('directory_class', array($baseDir)); @@ -71,7 +72,7 @@ class CompressorChannel extends BaseMiddleware implements Registerable { // Read all directories but no sub directories, .htaccess files and NullCompressor class while ($directoryEntry = $directoryInstance->readDirectoryExcept(array('.htaccess', 'class_NullCompressor.php'))) { // Debug message - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('COMPRESSOR[' . __METHOD__ . ':' . __LINE__ . ']: directoryEntry=' . $directoryEntry); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('COMPRESSOR: directoryEntry=' . $directoryEntry); // Is this a class file? if ((substr($directoryEntry, 0, 6) == 'class_') && (substr($directoryEntry, -4, 4) == '.php')) {