src/OxidEsalesDatabase.php

@@ -15,10 +15,7 @@ use Doctrine\DBAL\Configuration;
  */
 class OxidEsalesDatabase extends \OxidEsales\Eshop\Core\Database\Adapter\Doctrine\Database
 {
-    /**
+    public static function enableLogger($message = null)
-     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseConnectionException
-     */
-    public function d3EnableLogger($message)
     {
         $trace = debug_backtrace((PHP_VERSION_ID < 50306) ? 2 : DEBUG_BACKTRACE_IGNORE_ARGS);
 
@@ -36,20 +33,17 @@ class OxidEsalesDatabase extends \OxidEsales\Eshop\Core\Database\Adapter\Doctrin
     }
 
     /**
-     * @return mixed
+     * @return OxidSQLLogger
      * @throws \OxidEsales\Eshop\Core\Exception\DatabaseConnectionException
      */
-    public function d3GetLogger()
+    public static function getLogger()
     {
         $database = \OxidEsales\Eshop\Core\DatabaseProvider::getDb(\OxidEsales\Eshop\Core\DatabaseProvider::FETCH_MODE_ASSOC);
         $dbalConfig = $database->getConnection()->getConfiguration();
         return $dbalConfig->getSQLLogger();
     }
 
-    /**
+    public static function disableLogger()
-     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseConnectionException
-     */
-    public function d3DisableLogger()
     {
         $database = \OxidEsales\Eshop\Core\DatabaseProvider::getDb(\OxidEsales\Eshop\Core\DatabaseProvider::FETCH_MODE_ASSOC);
         $dbalConfig = $database->getConnection()->getConfiguration();

src/OxidSQLLogger.php

@@ -7,7 +7,6 @@
 
 namespace D3\OxidSqlLogger;
 
-use D3\ModCfg\Application\Model\d3database;
 use Doctrine\DBAL\Logging\SQLLogger;
 use Monolog;
 use NilPortugues\Sql\QueryFormatter\Formatter;
@@ -54,8 +53,6 @@ class OxidSQLLogger implements SQLLogger
             $this->stopQuery();
         }
 
-        $this->getPreparedStatementQuery($sql, $params);
-
         $this->SQLQuery = (new SQLQuery()) ->setSql($sql)
                                             ->setParams($params)
                                             ->setTypes($types)
@@ -65,23 +62,6 @@ class OxidSQLLogger implements SQLLogger
                                             ->setLogStartingFunction($this->logStartingFunction);
     }
 
-    /**
-     * @param string $sql
-     * @param array $params
-     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseConnectionException
-     */
-    public function getPreparedStatementQuery(&$sql, array $params = null)
-    {
-        if (class_exists(d3database::class)
-            && method_exists(d3database::class, 'getPreparedStatementQuery')
-            && count($params)
-            && ($query = d3database::getInstance()->getPreparedStatementQuery($sql, $params))
-            && strlen(trim($query))
-        ) {
-            $sql = $query;
-        }
-    }
-
     /**
      * @inheritDoc
      */

src/functions.php

@@ -6,14 +6,9 @@
  */
 
 function D3StartSQLLog($message = null) {
-    /** @var \D3\OxidSqlLogger\OxidEsalesDatabase $database */
+    \D3\OxidSqlLogger\OxidEsalesDatabase::enableLogger($message);
-    $database = oxNew(\D3\OxidSqlLogger\OxidEsalesDatabase::class);
-    $database->d3EnableLogger($message);
 }
 
-function D3StopSQLLog()
+function D3StopSQLLog() {
-{
+    \D3\OxidSqlLogger\OxidEsalesDatabase::disableLogger();
-    /** @var \D3\OxidSqlLogger\OxidEsalesDatabase $database */
-    $database = oxNew(\D3\OxidSqlLogger\OxidEsalesDatabase::class);
-    $database->d3DisableLogger();
 }