1.0.0

- PHP8 compatible code
- removed apostrophes

Author: Karel Wintersky

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "php": ">=7.4 | 8.*",
         "ext-pdo": "*",
-        "psr/log": "1.1.4"
+        "psr/log": "^1 | ^2 | ^3"
     },
     "require-dev": {
         "predis/predis": "^2.0",

sources/Database/DBHelper.php

@@ -27,18 +27,18 @@ public static function makeInsertQuery(string $table, &$dataset, bool $pretty =
 
         foreach ($dataset as $index => $value) {
             if (\strtoupper(\trim($value)) === 'NOW()') {
-                $insert_fields[] = "{$pretty} `{$index}` = NOW()";
+                $insert_fields[] = "{$pretty} {$index} = NOW()";
                 unset($dataset[ $index ]);
                 continue;
             }
 
             if (\strtoupper(\trim($value)) === 'UUID()') {
-                $insert_fields[] = "\r\n {$index} = UUID()";
+                $insert_fields[] = "{$pretty} {$index} = UUID()";
                 unset($dataset[$index]);
                 continue;
             }
 
-            $insert_fields[] = "{$pretty} `{$index}` = :{$index}";
+            $insert_fields[] = "{$pretty} {$index} = :{$index}";
         }
 
         $query .= \implode(', ', $insert_fields) . ' ;';
@@ -64,11 +64,11 @@ public static function makeUpdateQuery(string $table, &$dataset, $where_conditio
         $set = [];
         $pretty = $pretty ? "\r\n" : '';
 
-        $query = "UPDATE `{$table}` SET";
+        $query = "UPDATE {$table} SET";
 
         foreach ($dataset as $index => $value) {
             if (\strtoupper(\trim($value)) === 'NOW()') {
-                $set[] = "{$pretty} `{$index}` = NOW()";
+                $set[] = "{$pretty} {$index} = NOW()";
                 unset($dataset[ $index ]);
                 continue;
             }
@@ -79,7 +79,7 @@ public static function makeUpdateQuery(string $table, &$dataset, $where_conditio
                 continue;
             }
 
-            $set[] = "{$pretty} `{$index}` = :{$index}";
+            $set[] = "{$pretty} {$index} = :{$index}";
         }
 
         $query .= \implode(', ', $set);
@@ -117,11 +117,11 @@ public static function makeReplaceQuery(string $table, array &$dataset, string $
 
         $pretty = $pretty ? "\r\n" : '';
 
-        $query = "REPLACE `{$table}` SET ";
+        $query = "REPLACE {$table} SET ";
 
         foreach ($dataset as $index => $value) {
             if (\strtoupper(\trim($value)) === 'NOW()') {
-                $fields[] = "`{$index}` = NOW()";
+                $fields[] = "{$index} = NOW()";
                 unset($dataset[ $index ]);
                 continue;
             }
@@ -132,7 +132,7 @@ public static function makeReplaceQuery(string $table, array &$dataset, string $
                 continue;
             }
 
-            $fields[] = " `{$index}` = :{$index} ";
+            $fields[] = " {$index} = :{$index} ";
         }
 
         $query .= \implode(', ', $fields);
@@ -147,16 +147,19 @@ public static function makeReplaceQuery(string $table, array &$dataset, string $
      *
      * @param string $table
      * @param array $dataset
+     * @param bool $pretty
      * @return string
      */
-    public static function buildReplaceQuery(string $table, array $dataset):string
+    public static function buildReplaceQuery(string $table, array $dataset, bool $pretty = true):string
     {
+        $pretty = $pretty ? "\r\n" : '';
+
         $dataset_keys = \array_keys($dataset);
 
-        $query = "REPLACE INTO `{$table}` (";
+        $query = "REPLACE INTO {$table} (";
 
         $query.= \implode(', ', \array_map(function ($i){
-            return "`{$i}`";
+            return "{$i}";
         }, $dataset_keys));
 
         $query.= " ) VALUES ( ";
@@ -174,14 +177,17 @@ public static function buildReplaceQuery(string $table, array $dataset):string
      * @param string $table
      * @param array $dataset
      * @param null $where_condition - строка условия без WHERE ('x=0 AND y=0' ) или массив условий ['x=0', 'y=0']
+     * @param bool $pretty
      * @return string
      */
-    public static function buildUpdateQuery(string $table, array $dataset = [], $where_condition = null):string
+    public static function buildUpdateQuery(string $table, array $dataset = [], $where_condition = null, bool $pretty = true):string
     {
-        $query = "UPDATE `{$table}` SET ";
+        $pretty = $pretty ? "\r\n" : '';
+
+        $query = "UPDATE {$table} SET ";
 
-        $query.= \implode(', ', \array_map(function ($key, $value){
-            return "\r\n`{$key}` = :{$key}";
+        $query.= \implode(', ', \array_map(function ($key, $value) use ($pretty){
+            return "{$pretty} {$key} = :{$key}";
         }, \array_keys($dataset), $dataset));
 
         $where
@@ -209,12 +215,12 @@ public static function buildUpdateQuery(string $table, array $dataset = [], $whe
      */
     public static function buildReplaceQueryMVA(string $table, array $dataset, array $mva_attributes):array
     {
-        $query = "REPLACE INTO `{$table}` (";
+        $query = "REPLACE INTO {$table} (";
 
         $dataset_keys = \array_keys($dataset);
 
         $query .= \implode(', ', \array_map( static function ($i){
-            return "`{$i}`";
+            return "{$i}";
         }, $dataset_keys));
 
         $query .= " ) VALUES ( ";

sources/Database/DBMultiConnector.php

@@ -41,6 +41,8 @@ public function __construct($suffix = null)
         $state_error_code = 0;
         $state_error_msg = '';
 
+        $db_driver = $db_host = $db_name = $db_user = $db_pass = $db_port = null;
+
         try {
             if (\is_null($config)) {
                 throw new RuntimeException("Arris\DBMultiConnector class can't find configuration data for suffix {$suffix}" . PHP_EOL, 2);
@@ -53,6 +55,7 @@ public function __construct($suffix = null)
             $db_pass = $config['password'] ?? '';
             $db_port = $config['port'] ?? 3306;
 
+
             switch ($db_driver) {
                 case 'mysql': {
                     $dsl = \sprintf("mysql:host=%s;port=%s;dbname=%s",
@@ -85,9 +88,9 @@ public function __construct($suffix = null)
                 }
             } // switch
 
-            if (isset($config['charset']) && !\is_null($config['charset'])) {
+            if (isset($config['charset']) && !empty($config['charset'])) {
                 $sql = "SET NAMES {$config['charset']}";
-                if (isset($config['charset_collate']) && !\is_null($config['charset_collate'])) {
+                if (isset($config['charset_collate']) && !empty($config['charset_collate'])) {
                     $sql .= " COLLATE {$config['charset_collate']}";
                 }
                 $dbh->exec($sql);

sources/Database/DBWrapper.php

@@ -5,7 +5,6 @@
 use PDO;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use stdClass;
 
 /**
  * @method int|false            exec(string $statement = '')