Completed
Push — master ( 7d544d...db2f58 )
by Lars
02:14
created
src/voku/db/DB.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -347,9 +347,9 @@  discard block
 block discarded – undo
347 347
         }
348 348
 
349 349
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
350
-          $_value = '(' . implode(',', $_value) . ')';
350
+          $_value = '('.implode(',', $_value).')';
351 351
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
352
-          $_value = '(' . implode(' AND ', $_value) . ')';
352
+          $_value = '('.implode(' AND ', $_value).')';
353 353
         }
354 354
 
355 355
       } else {
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
395 395
         }
396 396
 
397
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
397
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
398 398
         $tmpCounter++;
399 399
       }
400 400
 
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
     }
465 465
 
466 466
     if (\mysqli_connect_errno()) {
467
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), false);
467
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), false);
468 468
 
469 469
       return false;
470 470
     }
@@ -529,14 +529,14 @@  discard block
 block discarded – undo
529 529
           $this->socket
530 530
       );
531 531
     } catch (\Exception $e) {
532
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
532
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
533 533
       $this->_debug->displayError($error, false);
534 534
       throw new DBConnectException($error, 100, $e);
535 535
     }
536 536
     \mysqli_report(MYSQLI_REPORT_OFF);
537 537
 
538 538
     if (!$this->connected) {
539
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error();
539
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error();
540 540
       $this->_debug->displayError($error, false);
541 541
       /** @noinspection ThrowRawExceptionInspection */
542 542
       throw new DBConnectException($error, 101);
@@ -578,10 +578,10 @@  discard block
 block discarded – undo
578 578
     }
579 579
 
580 580
     if ($databaseName) {
581
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
581
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
582 582
     }
583 583
 
584
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
584
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
585 585
 
586 586
     return $this->query($sql);
587 587
   }
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
 
776 776
     if ($useCache === true) {
777 777
       $cache = new Cache(null, null, false, $useCache);
778
-      $cacheKey = 'sql-' . md5($query);
778
+      $cacheKey = 'sql-'.md5($query);
779 779
 
780 780
       if (
781 781
           $cache->getCacheIsReady() === true
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
876 876
     static $firstInstance = null;
877 877
 
878 878
     if (
879
-        $hostname . $username . $password . $database . $port . $charset == ''
879
+        $hostname.$username.$password.$database.$port.$charset == ''
880 880
         &&
881 881
         null !== $firstInstance
882 882
     ) {
@@ -884,7 +884,7 @@  discard block
 block discarded – undo
884 884
     }
885 885
 
886 886
     $connection = md5(
887
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db
887
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db
888 888
     );
889 889
 
890 890
     if (!isset($instance[$connection])) {
@@ -971,10 +971,10 @@  discard block
 block discarded – undo
971 971
     $SET = $this->_parseArrayPair($data);
972 972
 
973 973
     if ($databaseName) {
974
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
974
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
975 975
     }
976 976
 
977
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
977
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
978 978
 
979 979
     return $this->query($sql);
980 980
   }
@@ -1068,10 +1068,10 @@  discard block
 block discarded – undo
1068 1068
 
1069 1069
       if ($this->_debug->checkForDev() === true) {
1070 1070
         echo "Info: maybe you have to increase your 'max_allowed_packet = 30M' in the config: 'my.conf' \n<br />";
1071
-        echo 'Error:' . $errorMsg;
1071
+        echo 'Error:'.$errorMsg;
1072 1072
       }
1073 1073
 
1074
-      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql);
1074
+      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql);
1075 1075
     }
1076 1076
 
1077 1077
     // return the result only if there was a "SELECT"-query
@@ -1268,11 +1268,11 @@  discard block
 block discarded – undo
1268 1268
 
1269 1269
       // exit if we have more then 3 "DB server has gone away"-errors
1270 1270
       if ($RECONNECT_COUNTER > 3) {
1271
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
1271
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
1272 1272
         throw new DBGoneAwayException($errorMsg);
1273 1273
       }
1274 1274
 
1275
-      $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql);
1275
+      $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql);
1276 1276
 
1277 1277
       // reconnect
1278 1278
       $RECONNECT_COUNTER++;
@@ -1282,10 +1282,10 @@  discard block
 block discarded – undo
1282 1282
       return $this->query($sql, $sqlParams);
1283 1283
     }
1284 1284
 
1285
-    $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
1285
+    $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
1286 1286
 
1287 1287
     // this query returned an error, we must display it (only for dev) !!!
1288
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
1288
+    $this->_debug->displayError($errorMsg.' | '.$sql);
1289 1289
 
1290 1290
     return false;
1291 1291
   }
@@ -1308,7 +1308,7 @@  discard block
 block discarded – undo
1308 1308
         )
1309 1309
     );
1310 1310
 
1311
-    return '`' . $str . '`';
1311
+    return '`'.$str.'`';
1312 1312
   }
1313 1313
 
1314 1314
   /**
@@ -1379,10 +1379,10 @@  discard block
 block discarded – undo
1379 1379
     $values = implode(',', $data);
1380 1380
 
1381 1381
     if ($databaseName) {
1382
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1382
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1383 1383
     }
1384 1384
 
1385
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1385
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1386 1386
 
1387 1387
     return $this->query($sql);
1388 1388
   }
@@ -1467,7 +1467,7 @@  discard block
 block discarded – undo
1467 1467
     $var = $this->escape($var, false, false, null);
1468 1468
 
1469 1469
     if (is_string($var)) {
1470
-      $var = "'" . trim($var, "'") . "'";
1470
+      $var = "'".trim($var, "'")."'";
1471 1471
     }
1472 1472
 
1473 1473
     return $var;
@@ -1504,10 +1504,10 @@  discard block
 block discarded – undo
1504 1504
     }
1505 1505
 
1506 1506
     if ($databaseName) {
1507
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1507
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1508 1508
     }
1509 1509
 
1510
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1510
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1511 1511
 
1512 1512
     return $this->query($sql);
1513 1513
   }
@@ -1534,10 +1534,10 @@  discard block
 block discarded – undo
1534 1534
     $return = mysqli_set_charset($this->link, $charset);
1535 1535
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1536 1536
     /** @noinspection UsageOfSilenceOperatorInspection */
1537
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1537
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1538 1538
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1539 1539
     /** @noinspection UsageOfSilenceOperatorInspection */
1540
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1540
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1541 1541
 
1542 1542
     return $return;
1543 1543
   }
@@ -1683,10 +1683,10 @@  discard block
 block discarded – undo
1683 1683
     }
1684 1684
 
1685 1685
     if ($databaseName) {
1686
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1686
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1687 1687
     }
1688 1688
 
1689
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1689
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1690 1690
 
1691 1691
     return $this->query($sql);
1692 1692
   }
Please login to merge, or discard this patch.