Completed
Push — master ( bfb92c...4ef0d9 )
by Lars
26:25 queued 14:35
created
src/voku/db/DB.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -288,14 +288,14 @@  discard block
 block discarded – undo
288 288
           $this->socket
289 289
       );
290 290
     } catch (\Exception $e) {
291
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
291
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
292 292
       $this->_debug->displayError($error, false);
293 293
       throw new DBConnectException($error, 100, $e);
294 294
     }
295 295
     \mysqli_report(MYSQLI_REPORT_OFF);
296 296
 
297 297
     if (!$this->connected) {
298
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error();
298
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error();
299 299
       $this->_debug->displayError($error, false);
300 300
       /** @noinspection ThrowRawExceptionInspection */
301 301
       throw new DBConnectException($error, 101);
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
     static $firstInstance = null;
394 394
 
395 395
     if (
396
-        $hostname . $username . $password . $database . $port . $charset == ''
396
+        $hostname.$username.$password.$database.$port.$charset == ''
397 397
         &&
398 398
         null !== $firstInstance
399 399
     ) {
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
     }
402 402
 
403 403
     $connection = md5(
404
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db
404
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db
405 405
     );
406 406
 
407 407
     if (!isset($instance[$connection])) {
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
     $var = $this->escape($var, false, false, null);
616 616
 
617 617
     if (is_string($var)) {
618
-      $var = "'" . trim($var, "'") . "'";
618
+      $var = "'".trim($var, "'")."'";
619 619
     }
620 620
 
621 621
     return $var;
@@ -802,11 +802,11 @@  discard block
 block discarded – undo
802 802
 
803 803
       // exit if we have more then 3 "DB server has gone away"-errors
804 804
       if ($RECONNECT_COUNTER > 3) {
805
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
805
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
806 806
         throw new DBGoneAwayException($errorMsg);
807 807
       }
808 808
 
809
-      $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql);
809
+      $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql);
810 810
 
811 811
       // reconnect
812 812
       $RECONNECT_COUNTER++;
@@ -816,10 +816,10 @@  discard block
 block discarded – undo
816 816
       return $this->query($sql, $sqlParams);
817 817
     }
818 818
 
819
-    $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
819
+    $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
820 820
 
821 821
     // this query returned an error, we must display it (only for dev) !!!
822
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
822
+    $this->_debug->displayError($errorMsg.' | '.$sql);
823 823
 
824 824
     return false;
825 825
   }
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
 
892 892
     if ($useCache === true) {
893 893
       $cache = new Cache(null, null, false, $useCache);
894
-      $cacheKey = 'sql-' . md5($query);
894
+      $cacheKey = 'sql-'.md5($query);
895 895
 
896 896
       if (
897 897
           $cache->getCacheIsReady() === true
@@ -1008,10 +1008,10 @@  discard block
 block discarded – undo
1008 1008
     $return = mysqli_set_charset($this->link, $charset);
1009 1009
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1010 1010
     /** @noinspection UsageOfSilenceOperatorInspection */
1011
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1011
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1012 1012
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1013 1013
     /** @noinspection UsageOfSilenceOperatorInspection */
1014
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1014
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1015 1015
 
1016 1016
     return $return;
1017 1017
   }
@@ -1098,10 +1098,10 @@  discard block
 block discarded – undo
1098 1098
 
1099 1099
       if ($this->_debug->checkForDev() === true) {
1100 1100
         echo "Info: maybe you have to increase your 'max_allowed_packet = 30M' in the config: 'my.conf' \n<br />";
1101
-        echo 'Error:' . $errorMsg;
1101
+        echo 'Error:'.$errorMsg;
1102 1102
       }
1103 1103
 
1104
-      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql);
1104
+      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql);
1105 1105
     }
1106 1106
 
1107 1107
     // return the result only if there was a "SELECT"-query
@@ -1140,7 +1140,7 @@  discard block
 block discarded – undo
1140 1140
     }
1141 1141
 
1142 1142
     if (\mysqli_connect_errno()) {
1143
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), false);
1143
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), false);
1144 1144
 
1145 1145
       return false;
1146 1146
     }
@@ -1253,10 +1253,10 @@  discard block
 block discarded – undo
1253 1253
     $SET = $this->_parseArrayPair($data);
1254 1254
 
1255 1255
     if ($databaseName) {
1256
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1256
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1257 1257
     }
1258 1258
 
1259
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1259
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1260 1260
 
1261 1261
     return $this->query($sql);
1262 1262
   }
@@ -1357,9 +1357,9 @@  discard block
 block discarded – undo
1357 1357
         }
1358 1358
 
1359 1359
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
1360
-          $_value = '(' . implode(',', $_value) . ')';
1360
+          $_value = '('.implode(',', $_value).')';
1361 1361
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
1362
-          $_value = '(' . implode(' AND ', $_value) . ')';
1362
+          $_value = '('.implode(' AND ', $_value).')';
1363 1363
         }
1364 1364
 
1365 1365
       } else {
@@ -1404,7 +1404,7 @@  discard block
 block discarded – undo
1404 1404
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
1405 1405
         }
1406 1406
 
1407
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
1407
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
1408 1408
         $tmpCounter++;
1409 1409
       }
1410 1410
 
@@ -1436,7 +1436,7 @@  discard block
 block discarded – undo
1436 1436
         )
1437 1437
     );
1438 1438
 
1439
-    return '`' . $str . '`';
1439
+    return '`'.$str.'`';
1440 1440
   }
1441 1441
 
1442 1442
   /**
@@ -1494,10 +1494,10 @@  discard block
 block discarded – undo
1494 1494
     $values = implode(',', $data);
1495 1495
 
1496 1496
     if ($databaseName) {
1497
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1497
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1498 1498
     }
1499 1499
 
1500
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1500
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1501 1501
 
1502 1502
     return $this->query($sql);
1503 1503
   }
@@ -1542,10 +1542,10 @@  discard block
 block discarded – undo
1542 1542
     }
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 = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1548
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1549 1549
 
1550 1550
     return $this->query($sql);
1551 1551
   }
@@ -1581,10 +1581,10 @@  discard block
 block discarded – undo
1581 1581
     }
1582 1582
 
1583 1583
     if ($databaseName) {
1584
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1584
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1585 1585
     }
1586 1586
 
1587
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1587
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1588 1588
 
1589 1589
     return $this->query($sql);
1590 1590
   }
@@ -1620,10 +1620,10 @@  discard block
 block discarded – undo
1620 1620
     }
1621 1621
 
1622 1622
     if ($databaseName) {
1623
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1623
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1624 1624
     }
1625 1625
 
1626
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1626
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1627 1627
 
1628 1628
     return $this->query($sql);
1629 1629
   }
Please login to merge, or discard this patch.