Completed
Push — master ( ac8426...af652f )
by Lars
02:17
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
 
@@ -650,7 +650,7 @@  discard block
 block discarded – undo
650 650
       }
651 651
 
652 652
     } catch (\Exception $e) {
653
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
653
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
654 654
       $this->_debug->displayError($error, false);
655 655
       throw new DBConnectException($error, 100, $e);
656 656
     }
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
 
659 659
     $errno = mysqli_connect_errno();
660 660
     if (!$this->connected || $errno) {
661
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
661
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
662 662
       $this->_debug->displayError($error, false);
663 663
       /** @noinspection ThrowRawExceptionInspection */
664 664
       throw new DBConnectException($error, 101);
@@ -700,10 +700,10 @@  discard block
 block discarded – undo
700 700
     }
701 701
 
702 702
     if ($databaseName) {
703
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
703
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
704 704
     }
705 705
 
706
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
706
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
707 707
 
708 708
     return $this->query($sql);
709 709
   }
@@ -895,7 +895,7 @@  discard block
 block discarded – undo
895 895
 
896 896
     if ($useCache === true) {
897 897
       $cache = new Cache(null, null, false, $useCache);
898
-      $cacheKey = 'sql-' . md5($query);
898
+      $cacheKey = 'sql-'.md5($query);
899 899
 
900 900
       if (
901 901
           $cache->getCacheIsReady() === true
@@ -1003,7 +1003,7 @@  discard block
 block discarded – undo
1003 1003
     static $firstInstance = null;
1004 1004
 
1005 1005
     if (
1006
-        $hostname . $username . $password . $database . $port . $charset == ''
1006
+        $hostname.$username.$password.$database.$port.$charset == ''
1007 1007
         &&
1008 1008
         null !== $firstInstance
1009 1009
     ) {
@@ -1013,7 +1013,7 @@  discard block
 block discarded – undo
1013 1013
     $extra_config_string = '';
1014 1014
     if (is_array($extra_config) === true) {
1015 1015
       foreach ($extra_config as $extra_config_key => $extra_config_value) {
1016
-        $extra_config_string .= $extra_config_key . (string)$extra_config_value;
1016
+        $extra_config_string .= $extra_config_key.(string)$extra_config_value;
1017 1017
       }
1018 1018
     } else {
1019 1019
       // only for backward compatibility
@@ -1021,7 +1021,7 @@  discard block
 block discarded – undo
1021 1021
     }
1022 1022
 
1023 1023
     $connection = md5(
1024
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1024
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1025 1025
     );
1026 1026
 
1027 1027
     if (!isset($instance[$connection])) {
@@ -1108,10 +1108,10 @@  discard block
 block discarded – undo
1108 1108
     $SET = $this->_parseArrayPair($data);
1109 1109
 
1110 1110
     if ($databaseName) {
1111
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1111
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1112 1112
     }
1113 1113
 
1114
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1114
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1115 1115
 
1116 1116
     return $this->query($sql);
1117 1117
   }
@@ -1433,11 +1433,11 @@  discard block
 block discarded – undo
1433 1433
 
1434 1434
       // exit if we have more then 3 "DB server has gone away"-errors
1435 1435
       if ($RECONNECT_COUNTER > 3) {
1436
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql, 5);
1436
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1437 1437
         throw new DBGoneAwayException($errorMessage);
1438 1438
       }
1439 1439
 
1440
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql);
1440
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1441 1441
 
1442 1442
       // reconnect
1443 1443
       $RECONNECT_COUNTER++;
@@ -1451,10 +1451,10 @@  discard block
 block discarded – undo
1451 1451
       return false;
1452 1452
     }
1453 1453
 
1454
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql);
1454
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1455 1455
 
1456 1456
     // this query returned an error, we must display it (only for dev) !!!
1457
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber. ') ' . ' | ' . $sql);
1457
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql);
1458 1458
 
1459 1459
     return false;
1460 1460
   }
@@ -1477,7 +1477,7 @@  discard block
 block discarded – undo
1477 1477
         )
1478 1478
     );
1479 1479
 
1480
-    return '`' . $str . '`';
1480
+    return '`'.$str.'`';
1481 1481
   }
1482 1482
 
1483 1483
   /**
@@ -1548,10 +1548,10 @@  discard block
 block discarded – undo
1548 1548
     $values = implode(',', $data);
1549 1549
 
1550 1550
     if ($databaseName) {
1551
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1551
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1552 1552
     }
1553 1553
 
1554
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1554
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1555 1555
 
1556 1556
     return $this->query($sql);
1557 1557
   }
@@ -1675,7 +1675,7 @@  discard block
 block discarded – undo
1675 1675
     $var = $this->escape($var, false, false, null);
1676 1676
 
1677 1677
     if (is_string($var)) {
1678
-      $var = "'" . trim($var, "'") . "'";
1678
+      $var = "'".trim($var, "'")."'";
1679 1679
     }
1680 1680
 
1681 1681
     return $var;
@@ -1712,10 +1712,10 @@  discard block
 block discarded – undo
1712 1712
     }
1713 1713
 
1714 1714
     if ($databaseName) {
1715
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1715
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1716 1716
     }
1717 1717
 
1718
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1718
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1719 1719
 
1720 1720
     return $this->query($sql);
1721 1721
   }
@@ -1742,10 +1742,10 @@  discard block
 block discarded – undo
1742 1742
     $return = mysqli_set_charset($this->link, $charset);
1743 1743
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1744 1744
     /** @noinspection UsageOfSilenceOperatorInspection */
1745
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1745
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1746 1746
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1747 1747
     /** @noinspection UsageOfSilenceOperatorInspection */
1748
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1748
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1749 1749
 
1750 1750
     return $return;
1751 1751
   }
@@ -1891,10 +1891,10 @@  discard block
 block discarded – undo
1891 1891
     }
1892 1892
 
1893 1893
     if ($databaseName) {
1894
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1894
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1895 1895
     }
1896 1896
 
1897
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1897
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1898 1898
 
1899 1899
     return $this->query($sql);
1900 1900
   }
Please login to merge, or discard this patch.