Completed
Push — master ( 87c372...9db816 )
by Lars
01:48
created
src/voku/db/DB.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -410,9 +410,9 @@  discard block
 block discarded – undo
410 410
         }
411 411
 
412 412
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
413
-          $_value = '(' . implode(',', $_value) . ')';
413
+          $_value = '('.implode(',', $_value).')';
414 414
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
415
-          $_value = '(' . implode(' AND ', $_value) . ')';
415
+          $_value = '('.implode(' AND ', $_value).')';
416 416
         }
417 417
 
418 418
       } else {
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
458 458
         }
459 459
 
460
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
460
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
461 461
         $tmpCounter++;
462 462
       }
463 463
 
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
       );
632 632
 
633 633
     } catch (\Exception $e) {
634
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
634
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
635 635
       $this->_debug->displayError($error, false);
636 636
       throw new DBConnectException($error, 100, $e);
637 637
     }
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
 
640 640
     $errno = mysqli_connect_errno();
641 641
     if (!$this->connected || $errno) {
642
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
642
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
643 643
       $this->_debug->displayError($error, false);
644 644
       /** @noinspection ThrowRawExceptionInspection */
645 645
       throw new DBConnectException($error, 101);
@@ -681,10 +681,10 @@  discard block
 block discarded – undo
681 681
     }
682 682
 
683 683
     if ($databaseName) {
684
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
684
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
685 685
     }
686 686
 
687
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
687
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
688 688
 
689 689
     return $this->query($sql);
690 690
   }
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
876 876
 
877 877
     if ($useCache === true) {
878 878
       $cache = new Cache(null, null, false, $useCache);
879
-      $cacheKey = 'sql-' . md5($query);
879
+      $cacheKey = 'sql-'.md5($query);
880 880
 
881 881
       if (
882 882
           $cache->getCacheIsReady() === true
@@ -983,7 +983,7 @@  discard block
 block discarded – undo
983 983
     static $firstInstance = null;
984 984
 
985 985
     if (
986
-        $hostname . $username . $password . $database . $port . $charset == ''
986
+        $hostname.$username.$password.$database.$port.$charset == ''
987 987
         &&
988 988
         null !== $firstInstance
989 989
     ) {
@@ -993,7 +993,7 @@  discard block
 block discarded – undo
993 993
     $extra_config_string = '';
994 994
     if (is_array($extra_config) === true) {
995 995
       foreach ($extra_config as $extra_config_key => $extra_config_value) {
996
-        $extra_config_string .= $extra_config_key . (string)$extra_config_value;
996
+        $extra_config_string .= $extra_config_key.(string)$extra_config_value;
997 997
       }
998 998
     } else {
999 999
       // only for backward compatibility
@@ -1001,7 +1001,7 @@  discard block
 block discarded – undo
1001 1001
     }
1002 1002
 
1003 1003
     $connection = md5(
1004
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1004
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1005 1005
     );
1006 1006
 
1007 1007
     if (!isset($instance[$connection])) {
@@ -1088,10 +1088,10 @@  discard block
 block discarded – undo
1088 1088
     $SET = $this->_parseArrayPair($data);
1089 1089
 
1090 1090
     if ($databaseName) {
1091
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1091
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1092 1092
     }
1093 1093
 
1094
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1094
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1095 1095
 
1096 1096
     return $this->query($sql);
1097 1097
   }
@@ -1417,11 +1417,11 @@  discard block
 block discarded – undo
1417 1417
 
1418 1418
       // exit if we have more then 3 "DB server has gone away"-errors
1419 1419
       if ($RECONNECT_COUNTER > 3) {
1420
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql, 5);
1420
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1421 1421
         throw new DBGoneAwayException($errorMessage);
1422 1422
       }
1423 1423
 
1424
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql);
1424
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1425 1425
 
1426 1426
       // reconnect
1427 1427
       $RECONNECT_COUNTER++;
@@ -1435,10 +1435,10 @@  discard block
 block discarded – undo
1435 1435
       return false;
1436 1436
     }
1437 1437
 
1438
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql);
1438
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1439 1439
 
1440 1440
     // this query returned an error, we must display it (only for dev) !!!
1441
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber. ') ' . ' | ' . $sql);
1441
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql);
1442 1442
 
1443 1443
     return false;
1444 1444
   }
@@ -1461,7 +1461,7 @@  discard block
 block discarded – undo
1461 1461
         )
1462 1462
     );
1463 1463
 
1464
-    return '`' . $str . '`';
1464
+    return '`'.$str.'`';
1465 1465
   }
1466 1466
 
1467 1467
   /**
@@ -1532,10 +1532,10 @@  discard block
 block discarded – undo
1532 1532
     $values = implode(',', $data);
1533 1533
 
1534 1534
     if ($databaseName) {
1535
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1535
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1536 1536
     }
1537 1537
 
1538
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1538
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1539 1539
 
1540 1540
     return $this->query($sql);
1541 1541
   }
@@ -1659,7 +1659,7 @@  discard block
 block discarded – undo
1659 1659
     $var = $this->escape($var, false, false, null);
1660 1660
 
1661 1661
     if (is_string($var)) {
1662
-      $var = "'" . trim($var, "'") . "'";
1662
+      $var = "'".trim($var, "'")."'";
1663 1663
     }
1664 1664
 
1665 1665
     return $var;
@@ -1696,10 +1696,10 @@  discard block
 block discarded – undo
1696 1696
     }
1697 1697
 
1698 1698
     if ($databaseName) {
1699
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1699
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1700 1700
     }
1701 1701
 
1702
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1702
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1703 1703
 
1704 1704
     return $this->query($sql);
1705 1705
   }
@@ -1726,10 +1726,10 @@  discard block
 block discarded – undo
1726 1726
     $return = mysqli_set_charset($this->link, $charset);
1727 1727
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1728 1728
     /** @noinspection UsageOfSilenceOperatorInspection */
1729
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1729
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1730 1730
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1731 1731
     /** @noinspection UsageOfSilenceOperatorInspection */
1732
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1732
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1733 1733
 
1734 1734
     return $return;
1735 1735
   }
@@ -1875,10 +1875,10 @@  discard block
 block discarded – undo
1875 1875
     }
1876 1876
 
1877 1877
     if ($databaseName) {
1878
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1878
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1879 1879
     }
1880 1880
 
1881
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1881
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1882 1882
 
1883 1883
     return $this->query($sql);
1884 1884
   }
Please login to merge, or discard this patch.
src/voku/db/Result.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
   {
623 623
     if ($as_array) {
624 624
       return array_map(
625
-          function ($object) {
625
+          function($object) {
626 626
             return (array)$object;
627 627
           },
628 628
           \mysqli_fetch_fields($this->_result)
@@ -734,7 +734,7 @@  discard block
 block discarded – undo
734 734
     }
735 735
 
736 736
     return array_map(
737
-        function ($values) use ($keys) {
737
+        function($values) use ($keys) {
738 738
           return array_combine($keys, $values);
739 739
         }, $rows
740 740
     );
Please login to merge, or discard this patch.