From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Feb 2017 16:23:04 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=a57cbf597f252876708b30deef97967d1c208aeb;hp=8c29c7208dc27ea0d088aa1f232713775c007ce5

Continued:
- all compressors now have own distinct namespace, so also the
  CompressorChannel class needs some fixing
- added "import" of Compressor
- added "import" of DatabaseConnection
- added "import" of DatabaseConnector

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

diff --git a/inc/database.php b/inc/database.php
index 6bcb5153..01ab8471 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -1,6 +1,7 @@
 <?php
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Connection\Database\DatabaseConnection;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Middleware\Debug\DebugMiddleware;
 
diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index 30205752..f306b320 100644
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -3,7 +3,9 @@
 namespace CoreFramework\Object;
 
 // Import framework stuff
+use CoreFramework\Compressor\Compressor;
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Connection\Database\DatabaseConnection;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Criteria\Criteria;
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
diff --git a/inc/main/classes/compressor/class_Bzip2Compressor.php b/inc/main/classes/compressor/class_Bzip2Compressor.php
index 4c2f7880..3708da83 100644
--- a/inc/main/classes/compressor/class_Bzip2Compressor.php
+++ b/inc/main/classes/compressor/class_Bzip2Compressor.php
@@ -1,8 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Compressor;
+namespace CoreFramework\Compressor\Bzip2;
 
 // Import framework stuff
+use CoreFramework\Compressor\Compressor;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/compressor/class_GzipCompressor.php b/inc/main/classes/compressor/class_GzipCompressor.php
index 44f5371a..ee76b540 100644
--- a/inc/main/classes/compressor/class_GzipCompressor.php
+++ b/inc/main/classes/compressor/class_GzipCompressor.php
@@ -1,8 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Compressor;
+namespace CoreFramework\Compressor\Gzip;
 
 // Import framework stuff
+use CoreFramework\Compressor\Compressor;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/compressor/class_NullCompressor.php b/inc/main/classes/compressor/class_NullCompressor.php
index 1b7a69de..44ccb772 100644
--- a/inc/main/classes/compressor/class_NullCompressor.php
+++ b/inc/main/classes/compressor/class_NullCompressor.php
@@ -1,8 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Compressor;
+namespace CoreFramework\Compressor\Null;
 
 // Import framework stuff
+use CoreFramework\Compressor\Compressor;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/compressor/class_ZlibCompressor.php b/inc/main/classes/compressor/class_ZlibCompressor.php
index d5ceac39..9d7b07e8 100644
--- a/inc/main/classes/compressor/class_ZlibCompressor.php
+++ b/inc/main/classes/compressor/class_ZlibCompressor.php
@@ -1,8 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Compressor;
+namespace CoreFramework\Compressor\Zlib;
 
 // Import framework stuff
+use CoreFramework\Compressor\Compressor;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/interfaces/compressor/class_Compressor.php b/inc/main/interfaces/compressor/class_Compressor.php
index d06283f3..8cefb63d 100644
--- a/inc/main/interfaces/compressor/class_Compressor.php
+++ b/inc/main/interfaces/compressor/class_Compressor.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Compression;
+namespace CoreFramework\Compressor;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
diff --git a/inc/main/middleware/compressor/class_CompressorChannel.php b/inc/main/middleware/compressor/class_CompressorChannel.php
index 618e82f1..1e7bf82a 100644
--- a/inc/main/middleware/compressor/class_CompressorChannel.php
+++ b/inc/main/middleware/compressor/class_CompressorChannel.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Middleware\Compressor;
 
 // Import framework stuff
+use CoreFramework\Compressor\Compressor;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Middleware\BaseMiddleware;
 use CoreFramework\Registry\Registerable;
@@ -78,10 +79,19 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
 					 * your files like your classes and also that's why you
 					 * must keep on class in one file.
 					 */
-					$className = substr($directoryEntry, 6, -4);
+
+					// Base name of compressor class
+					$baseClassName = substr($directoryEntry, 6, -4);
+
+					// Create full class name (with namespace
+					$fullClassName = sprintf(
+						'CoreFramework\Compressor\%s\%s',
+						str_replace('Compressor', '', $baseClassName),
+						$baseClassName
+					);
 
 					// Get an instance from our object factory
-					$tempInstance = ObjectFactory::createObjectByName($className);
+					$tempInstance = ObjectFactory::createObjectByName($fullClassName);
 
 					// Is it null?
 					if (is_null($tempInstance)) {
@@ -109,7 +119,7 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
 		) {
 			// Set the null compressor handler. This should not be configureable!
 			// @TODO Is there a configurable fall-back compressor needed, or is NullCompressor okay?
-			$compressorInstance->setCompressor(ObjectFactory::createObjectByName('NullCompressor'));
+			$compressorInstance->setCompressor(ObjectFactory::createObjectByName('CoreFramework\Compressor\Null\NullCompressor'));
 		} // END - if
 
 		// Return the compressor instance
diff --git a/inc/main/middleware/database/class_DatabaseConnection.php b/inc/main/middleware/database/class_DatabaseConnection.php
index 7ef989b5..9c539597 100644
--- a/inc/main/middleware/database/class_DatabaseConnection.php
+++ b/inc/main/middleware/database/class_DatabaseConnection.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Connection\Database;
 
 // Import framework stuff
+use CoreFramework\Connector\Database\DatabaseConnector;
 use CoreFramework\Criteria\Criteria;
 use CoreFramework\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Database\Backend\DatabaseBackend;