Fixed and continued:

[core.git] / inc / main / middleware / database / class_DatabaseConnection.php

diff --git a/inc/main/middleware/database/class_DatabaseConnection.php b/inc/main/middleware/database/class_DatabaseConnection.php
index d6e847cc2f80efb0021613bab8882ce8dbcf86ef..7d7686a777fbfaa8dcbf1e1e561c1cd8aec14f4c 100644 (file)
--- a/inc/main/middleware/database/class_DatabaseConnection.php
+++ b/inc/main/middleware/database/class_DatabaseConnection.php
@@ -3,8 +3,13 @@
 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;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Middleware\BaseMiddleware;
+use CoreFramework\Middleware\Debug\DebugMiddleware;
 
 /**
  * Database selector class
@@ -62,6 +67,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
         *
         * @param       $debugInstance  An instance of a DebugMiddleware class
         * @param       $dbLayer                An instance of a DatabaseBackend class
+        * @todo        $debugInstance is currently not used
         */
        public static final function createDatabaseConnection (DebugMiddleware $debugInstance, DatabaseBackend $dbLayer) {
                // Get instance
@@ -216,10 +222,10 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
                $this->dbLayer->connectToDatabase();
 
                // Call database backend
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DB-CONNECTION[' . $this->__toString() . ']: Calling this->dbLayer->removeNonPublicDataFromArray(data) ...');
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DB-CONNECTION[' . $this->__toString() . ']: Calling this->dbLayer->removeNonPublicDataFromArray(data) ...');
                $data = $this->dbLayer->removeNonPublicDataFromArray($data);
 
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DB-CONNECTION[' . $this->__toString() . ']: data[]=' . gettype($data));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DB-CONNECTION[' . $this->__toString() . ']: data[]=' . gettype($data));
                return $data;
        }