Completed
Push — master ( 56efe1...a850eb )
by Lars
100:15 queued 98:37
created
src/voku/db/DB.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -228,7 +228,7 @@
 block discarded – undo
228 228
    * @param string         $username
229 229
    * @param string         $password
230 230
    * @param string         $database
231
-   * @param int|string     $port          <p>default is (int)3306</p>
231
+   * @param integer     $port          <p>default is (int)3306</p>
232 232
    * @param string         $charset       <p>default is 'utf8' or 'utf8mb4' (if supported)</p>
233 233
    * @param boolean|string $exit_on_error <p>Use a empty string "" or false to disable it.</p>
234 234
    * @param boolean|string $echo_on_error <p>Use a empty string "" or false to disable it.</p>
Please login to merge, or discard this patch.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -413,9 +413,9 @@  discard block
 block discarded – undo
413 413
         }
414 414
 
415 415
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
416
-          $_value = '(' . implode(',', $_value) . ')';
416
+          $_value = '('.implode(',', $_value).')';
417 417
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
418
-          $_value = '(' . implode(' AND ', $_value) . ')';
418
+          $_value = '('.implode(' AND ', $_value).')';
419 419
         }
420 420
 
421 421
       } else {
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
461 461
         }
462 462
 
463
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
463
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
464 464
         $tmpCounter++;
465 465
       }
466 466
 
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
           $flags
622 622
       );
623 623
     } catch (\Exception $e) {
624
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
624
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
625 625
       $this->_debug->displayError($error, false);
626 626
       throw new DBConnectException($error, 100, $e);
627 627
     }
@@ -629,7 +629,7 @@  discard block
 block discarded – undo
629 629
 
630 630
     $errno = mysqli_connect_errno();
631 631
     if (!$this->connected || $errno) {
632
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
632
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
633 633
       $this->_debug->displayError($error, false);
634 634
       throw new DBConnectException($error, 101);
635 635
     }
@@ -670,10 +670,10 @@  discard block
 block discarded – undo
670 670
     }
671 671
 
672 672
     if ($databaseName) {
673
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
673
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
674 674
     }
675 675
 
676
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
676
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
677 677
 
678 678
     return $this->query($sql);
679 679
   }
@@ -873,7 +873,7 @@  discard block
 block discarded – undo
873 873
 
874 874
     if ($useCache === true) {
875 875
       $cache = new Cache(null, null, false, $useCache);
876
-      $cacheKey = 'sql-' . md5($query);
876
+      $cacheKey = 'sql-'.md5($query);
877 877
 
878 878
       if (
879 879
           $cache->getCacheIsReady() === true
@@ -981,7 +981,7 @@  discard block
 block discarded – undo
981 981
     static $firstInstance = null;
982 982
 
983 983
     if (
984
-        $hostname . $username . $password . $database . $port . $charset == ''
984
+        $hostname.$username.$password.$database.$port.$charset == ''
985 985
         &&
986 986
         null !== $firstInstance
987 987
     ) {
@@ -991,7 +991,7 @@  discard block
 block discarded – undo
991 991
     $extra_config_string = '';
992 992
     if (is_array($extra_config) === true) {
993 993
       foreach ($extra_config as $extra_config_key => $extra_config_value) {
994
-        $extra_config_string .= $extra_config_key . (string)$extra_config_value;
994
+        $extra_config_string .= $extra_config_key.(string)$extra_config_value;
995 995
       }
996 996
     } else {
997 997
       // only for backward compatibility
@@ -999,7 +999,7 @@  discard block
 block discarded – undo
999 999
     }
1000 1000
 
1001 1001
     $connection = md5(
1002
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1002
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1003 1003
     );
1004 1004
 
1005 1005
     if (!isset($instance[$connection])) {
@@ -1086,10 +1086,10 @@  discard block
 block discarded – undo
1086 1086
     $SET = $this->_parseArrayPair($data);
1087 1087
 
1088 1088
     if ($databaseName) {
1089
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1089
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1090 1090
     }
1091 1091
 
1092
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1092
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1093 1093
 
1094 1094
     return $this->query($sql);
1095 1095
   }
@@ -1399,11 +1399,11 @@  discard block
 block discarded – undo
1399 1399
 
1400 1400
       // exit if we have more then 3 "DB server has gone away"-errors
1401 1401
       if ($RECONNECT_COUNTER > 3) {
1402
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql, 5);
1402
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1403 1403
         throw new DBGoneAwayException($errorMessage);
1404 1404
       }
1405 1405
 
1406
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql);
1406
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1407 1407
 
1408 1408
       // reconnect
1409 1409
       $RECONNECT_COUNTER++;
@@ -1417,10 +1417,10 @@  discard block
 block discarded – undo
1417 1417
       return false;
1418 1418
     }
1419 1419
 
1420
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql);
1420
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1421 1421
 
1422 1422
     // this query returned an error, we must display it (only for dev) !!!
1423
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber. ') ' . ' | ' . $sql);
1423
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql);
1424 1424
 
1425 1425
     return false;
1426 1426
   }
@@ -1443,7 +1443,7 @@  discard block
 block discarded – undo
1443 1443
         )
1444 1444
     );
1445 1445
 
1446
-    return '`' . $str . '`';
1446
+    return '`'.$str.'`';
1447 1447
   }
1448 1448
 
1449 1449
   /**
@@ -1514,10 +1514,10 @@  discard block
 block discarded – undo
1514 1514
     $values = implode(',', $data);
1515 1515
 
1516 1516
     if ($databaseName) {
1517
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1517
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1518 1518
     }
1519 1519
 
1520
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1520
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1521 1521
 
1522 1522
     return $this->query($sql);
1523 1523
   }
@@ -1643,7 +1643,7 @@  discard block
 block discarded – undo
1643 1643
     $var = $this->escape($var, false, false, null);
1644 1644
 
1645 1645
     if (is_string($var)) {
1646
-      $var = "'" . trim($var, "'") . "'";
1646
+      $var = "'".trim($var, "'")."'";
1647 1647
     }
1648 1648
 
1649 1649
     return $var;
@@ -1680,10 +1680,10 @@  discard block
 block discarded – undo
1680 1680
     }
1681 1681
 
1682 1682
     if ($databaseName) {
1683
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1683
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1684 1684
     }
1685 1685
 
1686
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1686
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1687 1687
 
1688 1688
     return $this->query($sql);
1689 1689
   }
@@ -1710,10 +1710,10 @@  discard block
 block discarded – undo
1710 1710
     $return = mysqli_set_charset($this->link, $charset);
1711 1711
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1712 1712
     /** @noinspection UsageOfSilenceOperatorInspection */
1713
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1713
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1714 1714
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1715 1715
     /** @noinspection UsageOfSilenceOperatorInspection */
1716
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1716
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1717 1717
 
1718 1718
     return $return;
1719 1719
   }
@@ -1859,10 +1859,10 @@  discard block
 block discarded – undo
1859 1859
     }
1860 1860
 
1861 1861
     if ($databaseName) {
1862
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1862
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1863 1863
     }
1864 1864
 
1865
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1865
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1866 1866
 
1867 1867
     return $this->query($sql);
1868 1868
   }
Please login to merge, or discard this patch.