Completed
Push — master ( b7af1e...adfd2c )
by Lars
12:23 queued 03:36
created
src/voku/db/DB.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -370,9 +370,9 @@  discard block
 block discarded – undo
370 370
         }
371 371
 
372 372
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
373
-          $_value = '(' . implode(',', $_value) . ')';
373
+          $_value = '('.implode(',', $_value).')';
374 374
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
375
-          $_value = '(' . implode(' AND ', $_value) . ')';
375
+          $_value = '('.implode(' AND ', $_value).')';
376 376
         }
377 377
 
378 378
       } else {
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
418 418
         }
419 419
 
420
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
420
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
421 421
         $tmpCounter++;
422 422
       }
423 423
 
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
           $flags
586 586
       );
587 587
     } catch (\Exception $e) {
588
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
588
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
589 589
       $this->_debug->displayError($error, false);
590 590
       throw new DBConnectException($error, 100, $e);
591 591
     }
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
593 593
 
594 594
     $errno = mysqli_connect_errno();
595 595
     if (!$this->connected || $errno) {
596
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
596
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
597 597
       $this->_debug->displayError($error, false);
598 598
       throw new DBConnectException($error, 101);
599 599
     }
@@ -634,10 +634,10 @@  discard block
 block discarded – undo
634 634
     }
635 635
 
636 636
     if ($databaseName) {
637
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
637
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
638 638
     }
639 639
 
640
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
640
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
641 641
 
642 642
     return $this->query($sql);
643 643
   }
@@ -831,7 +831,7 @@  discard block
 block discarded – undo
831 831
 
832 832
     if ($useCache === true) {
833 833
       $cache = new Cache(null, null, false, $useCache);
834
-      $cacheKey = 'sql-' . md5($query);
834
+      $cacheKey = 'sql-'.md5($query);
835 835
 
836 836
       if (
837 837
           $cache->getCacheIsReady() === true
@@ -932,7 +932,7 @@  discard block
 block discarded – undo
932 932
     static $firstInstance = null;
933 933
 
934 934
     if (
935
-        $hostname . $username . $password . $database . $port . $charset == ''
935
+        $hostname.$username.$password.$database.$port.$charset == ''
936 936
         &&
937 937
         null !== $firstInstance
938 938
     ) {
@@ -940,7 +940,7 @@  discard block
 block discarded – undo
940 940
     }
941 941
 
942 942
     $connection = md5(
943
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db
943
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db
944 944
     );
945 945
 
946 946
     if (!isset($instance[$connection])) {
@@ -1027,10 +1027,10 @@  discard block
 block discarded – undo
1027 1027
     $SET = $this->_parseArrayPair($data);
1028 1028
 
1029 1029
     if ($databaseName) {
1030
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1030
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1031 1031
     }
1032 1032
 
1033
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1033
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1034 1034
 
1035 1035
     return $this->query($sql);
1036 1036
   }
@@ -1124,10 +1124,10 @@  discard block
 block discarded – undo
1124 1124
 
1125 1125
       if ($this->_debug->checkForDev() === true) {
1126 1126
         echo "Info: maybe you have to increase your 'max_allowed_packet = 30M' in the config: 'my.conf' \n<br />";
1127
-        echo 'Error:' . $errorMsg;
1127
+        echo 'Error:'.$errorMsg;
1128 1128
       }
1129 1129
 
1130
-      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql);
1130
+      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql);
1131 1131
     }
1132 1132
 
1133 1133
     // return the result only if there was a "SELECT"-query
@@ -1324,11 +1324,11 @@  discard block
 block discarded – undo
1324 1324
 
1325 1325
       // exit if we have more then 3 "DB server has gone away"-errors
1326 1326
       if ($RECONNECT_COUNTER > 3) {
1327
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
1327
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
1328 1328
         throw new DBGoneAwayException($errorMsg);
1329 1329
       }
1330 1330
 
1331
-      $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql);
1331
+      $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql);
1332 1332
 
1333 1333
       // reconnect
1334 1334
       $RECONNECT_COUNTER++;
@@ -1338,10 +1338,10 @@  discard block
 block discarded – undo
1338 1338
       return $this->query($sql, $sqlParams);
1339 1339
     }
1340 1340
 
1341
-    $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
1341
+    $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
1342 1342
 
1343 1343
     // this query returned an error, we must display it (only for dev) !!!
1344
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
1344
+    $this->_debug->displayError($errorMsg.' | '.$sql);
1345 1345
 
1346 1346
     return false;
1347 1347
   }
@@ -1364,7 +1364,7 @@  discard block
 block discarded – undo
1364 1364
         )
1365 1365
     );
1366 1366
 
1367
-    return '`' . $str . '`';
1367
+    return '`'.$str.'`';
1368 1368
   }
1369 1369
 
1370 1370
   /**
@@ -1435,10 +1435,10 @@  discard block
 block discarded – undo
1435 1435
     $values = implode(',', $data);
1436 1436
 
1437 1437
     if ($databaseName) {
1438
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1438
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1439 1439
     }
1440 1440
 
1441
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1441
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1442 1442
 
1443 1443
     return $this->query($sql);
1444 1444
   }
@@ -1523,7 +1523,7 @@  discard block
 block discarded – undo
1523 1523
     $var = $this->escape($var, false, false, null);
1524 1524
 
1525 1525
     if (is_string($var)) {
1526
-      $var = "'" . trim($var, "'") . "'";
1526
+      $var = "'".trim($var, "'")."'";
1527 1527
     }
1528 1528
 
1529 1529
     return $var;
@@ -1560,10 +1560,10 @@  discard block
 block discarded – undo
1560 1560
     }
1561 1561
 
1562 1562
     if ($databaseName) {
1563
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1563
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1564 1564
     }
1565 1565
 
1566
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1566
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1567 1567
 
1568 1568
     return $this->query($sql);
1569 1569
   }
@@ -1590,10 +1590,10 @@  discard block
 block discarded – undo
1590 1590
     $return = mysqli_set_charset($this->link, $charset);
1591 1591
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1592 1592
     /** @noinspection UsageOfSilenceOperatorInspection */
1593
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1593
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1594 1594
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1595 1595
     /** @noinspection UsageOfSilenceOperatorInspection */
1596
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1596
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1597 1597
 
1598 1598
     return $return;
1599 1599
   }
@@ -1739,10 +1739,10 @@  discard block
 block discarded – undo
1739 1739
     }
1740 1740
 
1741 1741
     if ($databaseName) {
1742
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1742
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1743 1743
     }
1744 1744
 
1745
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1745
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1746 1746
 
1747 1747
     return $this->query($sql);
1748 1748
   }
Please login to merge, or discard this patch.