Completed
Push — master ( 58c13f...df8a36 )
by Lars
92:02 queued 77:04
created
src/voku/db/DB.php 1 patch
Spacing   +26 added lines, -26 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
   }
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
834 834
 
835 835
     if ($useCache === true) {
836 836
       $cache = new Cache(null, null, false, $useCache);
837
-      $cacheKey = 'sql-' . md5($query);
837
+      $cacheKey = 'sql-'.md5($query);
838 838
 
839 839
       if (
840 840
           $cache->getCacheIsReady() === true
@@ -935,7 +935,7 @@  discard block
 block discarded – undo
935 935
     static $firstInstance = null;
936 936
 
937 937
     if (
938
-        $hostname . $username . $password . $database . $port . $charset == ''
938
+        $hostname.$username.$password.$database.$port.$charset == ''
939 939
         &&
940 940
         null !== $firstInstance
941 941
     ) {
@@ -943,7 +943,7 @@  discard block
 block discarded – undo
943 943
     }
944 944
 
945 945
     $connection = md5(
946
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db
946
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db
947 947
     );
948 948
 
949 949
     if (!isset($instance[$connection])) {
@@ -1030,10 +1030,10 @@  discard block
 block discarded – undo
1030 1030
     $SET = $this->_parseArrayPair($data);
1031 1031
 
1032 1032
     if ($databaseName) {
1033
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1033
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1034 1034
     }
1035 1035
 
1036
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1036
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1037 1037
 
1038 1038
     return $this->query($sql);
1039 1039
   }
@@ -1340,11 +1340,11 @@  discard block
 block discarded – undo
1340 1340
 
1341 1341
       // exit if we have more then 3 "DB server has gone away"-errors
1342 1342
       if ($RECONNECT_COUNTER > 3) {
1343
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql, 5);
1343
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1344 1344
         throw new DBGoneAwayException($errorMessage);
1345 1345
       }
1346 1346
 
1347
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql);
1347
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1348 1348
 
1349 1349
       // reconnect
1350 1350
       $RECONNECT_COUNTER++;
@@ -1358,10 +1358,10 @@  discard block
 block discarded – undo
1358 1358
       return false;
1359 1359
     }
1360 1360
 
1361
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql);
1361
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1362 1362
 
1363 1363
     // this query returned an error, we must display it (only for dev) !!!
1364
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber. ') ' . ' | ' . $sql);
1364
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql);
1365 1365
 
1366 1366
     return false;
1367 1367
   }
@@ -1384,7 +1384,7 @@  discard block
 block discarded – undo
1384 1384
         )
1385 1385
     );
1386 1386
 
1387
-    return '`' . $str . '`';
1387
+    return '`'.$str.'`';
1388 1388
   }
1389 1389
 
1390 1390
   /**
@@ -1455,10 +1455,10 @@  discard block
 block discarded – undo
1455 1455
     $values = implode(',', $data);
1456 1456
 
1457 1457
     if ($databaseName) {
1458
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1458
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1459 1459
     }
1460 1460
 
1461
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1461
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1462 1462
 
1463 1463
     return $this->query($sql);
1464 1464
   }
@@ -1584,7 +1584,7 @@  discard block
 block discarded – undo
1584 1584
     $var = $this->escape($var, false, false, null);
1585 1585
 
1586 1586
     if (is_string($var)) {
1587
-      $var = "'" . trim($var, "'") . "'";
1587
+      $var = "'".trim($var, "'")."'";
1588 1588
     }
1589 1589
 
1590 1590
     return $var;
@@ -1621,10 +1621,10 @@  discard block
 block discarded – undo
1621 1621
     }
1622 1622
 
1623 1623
     if ($databaseName) {
1624
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1624
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1625 1625
     }
1626 1626
 
1627
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1627
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1628 1628
 
1629 1629
     return $this->query($sql);
1630 1630
   }
@@ -1651,10 +1651,10 @@  discard block
 block discarded – undo
1651 1651
     $return = mysqli_set_charset($this->link, $charset);
1652 1652
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1653 1653
     /** @noinspection UsageOfSilenceOperatorInspection */
1654
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1654
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1655 1655
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1656 1656
     /** @noinspection UsageOfSilenceOperatorInspection */
1657
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1657
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1658 1658
 
1659 1659
     return $return;
1660 1660
   }
@@ -1800,10 +1800,10 @@  discard block
 block discarded – undo
1800 1800
     }
1801 1801
 
1802 1802
     if ($databaseName) {
1803
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1803
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1804 1804
     }
1805 1805
 
1806
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1806
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1807 1807
 
1808 1808
     return $this->query($sql);
1809 1809
   }
Please login to merge, or discard this patch.