Completed
Push — master ( a068ee...8a455a )
by Lars
02:56
created
src/voku/db/DB.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -282,12 +282,12 @@  discard block
 block discarded – undo
282 282
           $this->socket
283 283
       );
284 284
     } catch (\Exception $e) {
285
-      $this->_debug->displayError('Error connecting to mysql server: ' . $e->getMessage(), true);
285
+      $this->_debug->displayError('Error connecting to mysql server: '.$e->getMessage(), true);
286 286
     }
287 287
     \mysqli_report(MYSQLI_REPORT_OFF);
288 288
 
289 289
     if (!$this->connected) {
290
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), true);
290
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), true);
291 291
     } else {
292 292
       $this->set_charset($this->charset);
293 293
     }
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
     static $firstInstance = null;
383 383
 
384 384
     if (
385
-        $hostname . $username . $password . $database . $port . $charset == ''
385
+        $hostname.$username.$password.$database.$port.$charset == ''
386 386
         &&
387 387
         null !== $firstInstance
388 388
     ) {
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
     }
391 391
 
392 392
     $connection = md5(
393
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db
393
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db
394 394
     );
395 395
 
396 396
     if (!isset($instance[$connection])) {
@@ -600,7 +600,7 @@  discard block
 block discarded – undo
600 600
     $var = $this->escape($var, false, false, null);
601 601
 
602 602
     if (is_string($var)) {
603
-      $var = "'" . trim($var, "'") . "'";
603
+      $var = "'".trim($var, "'")."'";
604 604
     }
605 605
 
606 606
     return $var;
@@ -786,11 +786,11 @@  discard block
 block discarded – undo
786 786
 
787 787
       // exit if we have more then 3 "DB server has gone away"-errors
788 788
       if ($RECONNECT_COUNTER > 3) {
789
-        $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
789
+        $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
790 790
         throw new \Exception($errorMsg);
791 791
       }
792 792
 
793
-      $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
793
+      $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
794 794
 
795 795
       // reconnect
796 796
       $RECONNECT_COUNTER++;
@@ -800,10 +800,10 @@  discard block
 block discarded – undo
800 800
       return $this->query($sql, $sqlParams);
801 801
     }
802 802
 
803
-    $this->_debug->mailToAdmin('SQL-Warning', $errorMsg . ":\n<br />" . $sql);
803
+    $this->_debug->mailToAdmin('SQL-Warning', $errorMsg.":\n<br />".$sql);
804 804
 
805 805
     // this query returned an error, we must display it (only for dev) !!!
806
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
806
+    $this->_debug->displayError($errorMsg.' | '.$sql);
807 807
 
808 808
     return false;
809 809
   }
@@ -872,7 +872,7 @@  discard block
 block discarded – undo
872 872
 
873 873
     if ($useCache === true) {
874 874
       $cache = new Cache(null, null, false, $useCache);
875
-      $cacheKey = 'sql-' . md5($query);
875
+      $cacheKey = 'sql-'.md5($query);
876 876
 
877 877
       if (
878 878
           $cache->getCacheIsReady() === true
@@ -987,9 +987,9 @@  discard block
 block discarded – undo
987 987
 
988 988
     $return = mysqli_set_charset($this->link, $charset);
989 989
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
990
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
990
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
991 991
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
992
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
992
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
993 993
 
994 994
     return $return;
995 995
   }
@@ -1076,10 +1076,10 @@  discard block
 block discarded – undo
1076 1076
 
1077 1077
       if ($this->_debug->checkForDev() === true) {
1078 1078
         echo "Info: maybe you have to increase your 'max_allowed_packet = 30M' in the config: 'my.conf' \n<br />";
1079
-        echo 'Error:' . $errorMsg;
1079
+        echo 'Error:'.$errorMsg;
1080 1080
       }
1081 1081
 
1082
-      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql);
1082
+      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql);
1083 1083
     }
1084 1084
 
1085 1085
     // return the result only if there was a "SELECT"-query
@@ -1118,7 +1118,7 @@  discard block
 block discarded – undo
1118 1118
     }
1119 1119
 
1120 1120
     if (\mysqli_connect_errno()) {
1121
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), true);
1121
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), true);
1122 1122
 
1123 1123
       return false;
1124 1124
     }
@@ -1229,10 +1229,10 @@  discard block
 block discarded – undo
1229 1229
     $SET = $this->_parseArrayPair($data);
1230 1230
 
1231 1231
     if ($database) {
1232
-      $database = $this->quote_string(trim($database)) . '.';
1232
+      $database = $this->quote_string(trim($database)).'.';
1233 1233
     }
1234 1234
 
1235
-    $sql = 'INSERT INTO ' . $database . $this->quote_string($table) . " SET $SET;";
1235
+    $sql = 'INSERT INTO '.$database.$this->quote_string($table)." SET $SET;";
1236 1236
 
1237 1237
     return $this->query($sql);
1238 1238
   }
@@ -1320,9 +1320,9 @@  discard block
 block discarded – undo
1320 1320
           }
1321 1321
 
1322 1322
           if ($_connector === 'NOT IN' || $_connector === 'IN') {
1323
-            $_value = '(' . implode(',', $_value) . ')';
1323
+            $_value = '('.implode(',', $_value).')';
1324 1324
           } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
1325
-            $_value = '(' . implode(' AND ', $_value) . ')';
1325
+            $_value = '('.implode(' AND ', $_value).')';
1326 1326
           }
1327 1327
 
1328 1328
         } else {
@@ -1330,7 +1330,7 @@  discard block
 block discarded – undo
1330 1330
         }
1331 1331
 
1332 1332
         $quoteString = $this->quote_string(trim(str_ireplace($_connector, '', $_key)));
1333
-        $pairs[] = ' ' . $quoteString . ' ' . $_connector . ' ' . $_value . " \n";
1333
+        $pairs[] = ' '.$quoteString.' '.$_connector.' '.$_value." \n";
1334 1334
       }
1335 1335
 
1336 1336
       $sql = implode($glue, $pairs);
@@ -1357,7 +1357,7 @@  discard block
 block discarded – undo
1357 1357
         )
1358 1358
     );
1359 1359
 
1360
-    return '`' . $str . '`';
1360
+    return '`'.$str.'`';
1361 1361
   }
1362 1362
 
1363 1363
   /**
@@ -1411,7 +1411,7 @@  discard block
 block discarded – undo
1411 1411
     }
1412 1412
     $values = implode(',', $data);
1413 1413
 
1414
-    $sql = 'REPLACE INTO ' . $this->quote_string($table) . " ($columns) VALUES ($values);";
1414
+    $sql = 'REPLACE INTO '.$this->quote_string($table)." ($columns) VALUES ($values);";
1415 1415
 
1416 1416
     return $this->query($sql);
1417 1417
   }
@@ -1453,10 +1453,10 @@  discard block
 block discarded – undo
1453 1453
     }
1454 1454
 
1455 1455
     if ($database) {
1456
-      $database = $this->quote_string(trim($database)) . '.';
1456
+      $database = $this->quote_string(trim($database)).'.';
1457 1457
     }
1458 1458
 
1459
-    $sql = 'UPDATE ' . $database . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1459
+    $sql = 'UPDATE '.$database.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1460 1460
 
1461 1461
     return $this->query($sql);
1462 1462
   }
@@ -1490,10 +1490,10 @@  discard block
 block discarded – undo
1490 1490
     }
1491 1491
 
1492 1492
     if ($database) {
1493
-      $database = $this->quote_string(trim($database)) . '.';
1493
+      $database = $this->quote_string(trim($database)).'.';
1494 1494
     }
1495 1495
 
1496
-    $sql = 'DELETE FROM ' . $database . $this->quote_string($table) . " WHERE ($WHERE);";
1496
+    $sql = 'DELETE FROM '.$database.$this->quote_string($table)." WHERE ($WHERE);";
1497 1497
 
1498 1498
     return $this->query($sql);
1499 1499
   }
@@ -1525,10 +1525,10 @@  discard block
 block discarded – undo
1525 1525
     }
1526 1526
 
1527 1527
     if ($database) {
1528
-      $database = $this->quote_string(trim($database)) . '.';
1528
+      $database = $this->quote_string(trim($database)).'.';
1529 1529
     }
1530 1530
 
1531
-    $sql = 'SELECT * FROM ' . $database . $this->quote_string($table) . " WHERE ($WHERE);";
1531
+    $sql = 'SELECT * FROM '.$database.$this->quote_string($table)." WHERE ($WHERE);";
1532 1532
 
1533 1533
     return $this->query($sql);
1534 1534
   }
Please login to merge, or discard this patch.