Completed
Push — master ( a850eb...7115b4 )
by Lars
112:24 queued 95:41
created
src/voku/db/DB.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -416,9 +416,9 @@  discard block
 block discarded – undo
416 416
         }
417 417
 
418 418
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
419
-          $_value = '(' . implode(',', $_value) . ')';
419
+          $_value = '('.implode(',', $_value).')';
420 420
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
421
-          $_value = '(' . implode(' AND ', $_value) . ')';
421
+          $_value = '('.implode(' AND ', $_value).')';
422 422
         }
423 423
 
424 424
       } else {
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
464 464
         }
465 465
 
466
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
466
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
467 467
         $tmpCounter++;
468 468
       }
469 469
 
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
       );
648 648
 
649 649
     } catch (\Exception $e) {
650
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
650
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
651 651
       $this->_debug->displayError($error, false);
652 652
       throw new DBConnectException($error, 100, $e);
653 653
     }
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
 
656 656
     $errno = mysqli_connect_errno();
657 657
     if (!$this->connected || $errno) {
658
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
658
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
659 659
       $this->_debug->displayError($error, false);
660 660
       throw new DBConnectException($error, 101);
661 661
     }
@@ -696,10 +696,10 @@  discard block
 block discarded – undo
696 696
     }
697 697
 
698 698
     if ($databaseName) {
699
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
699
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
700 700
     }
701 701
 
702
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
702
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
703 703
 
704 704
     return $this->query($sql);
705 705
   }
@@ -900,7 +900,7 @@  discard block
 block discarded – undo
900 900
 
901 901
     if ($useCache === true) {
902 902
       $cache = new Cache(null, null, false, $useCache);
903
-      $cacheKey = 'sql-' . md5($query);
903
+      $cacheKey = 'sql-'.md5($query);
904 904
 
905 905
       if (
906 906
           $cache->getCacheIsReady() === true
@@ -1008,7 +1008,7 @@  discard block
 block discarded – undo
1008 1008
     static $firstInstance = null;
1009 1009
 
1010 1010
     if (
1011
-        $hostname . $username . $password . $database . $port . $charset == ''
1011
+        $hostname.$username.$password.$database.$port.$charset == ''
1012 1012
         &&
1013 1013
         null !== $firstInstance
1014 1014
     ) {
@@ -1018,7 +1018,7 @@  discard block
 block discarded – undo
1018 1018
     $extra_config_string = '';
1019 1019
     if (is_array($extra_config) === true) {
1020 1020
       foreach ($extra_config as $extra_config_key => $extra_config_value) {
1021
-        $extra_config_string .= $extra_config_key . (string)$extra_config_value;
1021
+        $extra_config_string .= $extra_config_key.(string)$extra_config_value;
1022 1022
       }
1023 1023
     } else {
1024 1024
       // only for backward compatibility
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
1026 1026
     }
1027 1027
 
1028 1028
     $connection = md5(
1029
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1029
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1030 1030
     );
1031 1031
 
1032 1032
     if (!isset($instance[$connection])) {
@@ -1113,10 +1113,10 @@  discard block
 block discarded – undo
1113 1113
     $SET = $this->_parseArrayPair($data);
1114 1114
 
1115 1115
     if ($databaseName) {
1116
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1116
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1117 1117
     }
1118 1118
 
1119
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1119
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1120 1120
 
1121 1121
     return $this->query($sql);
1122 1122
   }
@@ -1427,11 +1427,11 @@  discard block
 block discarded – undo
1427 1427
 
1428 1428
       // exit if we have more then 3 "DB server has gone away"-errors
1429 1429
       if ($RECONNECT_COUNTER > 3) {
1430
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
1430
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1431 1431
         throw new DBGoneAwayException($errorMessage);
1432 1432
       }
1433 1433
 
1434
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1434
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1435 1435
 
1436 1436
       // reconnect
1437 1437
       $RECONNECT_COUNTER++;
@@ -1445,10 +1445,10 @@  discard block
 block discarded – undo
1445 1445
       return false;
1446 1446
     }
1447 1447
 
1448
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1448
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1449 1449
 
1450 1450
     // this query returned an error, we must display it (only for dev) !!!
1451
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql);
1451
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql);
1452 1452
 
1453 1453
     return false;
1454 1454
   }
@@ -1471,7 +1471,7 @@  discard block
 block discarded – undo
1471 1471
         )
1472 1472
     );
1473 1473
 
1474
-    return '`' . $str . '`';
1474
+    return '`'.$str.'`';
1475 1475
   }
1476 1476
 
1477 1477
   /**
@@ -1542,10 +1542,10 @@  discard block
 block discarded – undo
1542 1542
     $values = implode(',', $data);
1543 1543
 
1544 1544
     if ($databaseName) {
1545
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1545
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1546 1546
     }
1547 1547
 
1548
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1548
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1549 1549
 
1550 1550
     return $this->query($sql);
1551 1551
   }
@@ -1633,7 +1633,7 @@  discard block
 block discarded – undo
1633 1633
     $var = $this->escape($var, false, false, null);
1634 1634
 
1635 1635
     if (is_string($var)) {
1636
-      $var = "'" . trim($var, "'") . "'";
1636
+      $var = "'".trim($var, "'")."'";
1637 1637
     }
1638 1638
 
1639 1639
     return $var;
@@ -1670,10 +1670,10 @@  discard block
 block discarded – undo
1670 1670
     }
1671 1671
 
1672 1672
     if ($databaseName) {
1673
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1673
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1674 1674
     }
1675 1675
 
1676
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1676
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1677 1677
 
1678 1678
     return $this->query($sql);
1679 1679
   }
@@ -1716,10 +1716,10 @@  discard block
 block discarded – undo
1716 1716
     $return = mysqli_set_charset($this->link, $charset);
1717 1717
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1718 1718
     /** @noinspection UsageOfSilenceOperatorInspection */
1719
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1719
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1720 1720
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1721 1721
     /** @noinspection UsageOfSilenceOperatorInspection */
1722
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1722
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1723 1723
 
1724 1724
     return $return;
1725 1725
   }
@@ -1886,10 +1886,10 @@  discard block
 block discarded – undo
1886 1886
     }
1887 1887
 
1888 1888
     if ($databaseName) {
1889
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1889
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1890 1890
     }
1891 1891
 
1892
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1892
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1893 1893
 
1894 1894
     return $this->query($sql);
1895 1895
   }
Please login to merge, or discard this patch.