Completed
Push — master ( cd7afc...70524f )
by Lars
04:05
created
src/voku/db/DB.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -423,9 +423,9 @@  discard block
 block discarded – undo
423 423
         }
424 424
 
425 425
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
426
-          $_value = '(' . \implode(',', $_value) . ')';
426
+          $_value = '('.\implode(',', $_value).')';
427 427
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
428
-          $_value = '(' . \implode(' AND ', $_value) . ')';
428
+          $_value = '('.\implode(' AND ', $_value).')';
429 429
         }
430 430
 
431 431
       } else {
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
           $valueInner = "''";
473 473
         }
474 474
 
475
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
475
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
476 476
         $tmpCounter++;
477 477
       }
478 478
 
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
 
560 560
       // add ":" if needed
561 561
       if (\strpos($name, ':') !== 0) {
562
-        $nameTmp = ':' . $name;
562
+        $nameTmp = ':'.$name;
563 563
       } else {
564 564
         $nameTmp = $name;
565 565
       }
@@ -748,7 +748,7 @@  discard block
 block discarded – undo
748 748
         $this->connected = $this->doctrine_connection->isConnected();
749 749
 
750 750
         if (!$this->connected) {
751
-          $error = 'Error connecting to mysql server: ' . $this->doctrine_connection->errorInfo();
751
+          $error = 'Error connecting to mysql server: '.$this->doctrine_connection->errorInfo();
752 752
           $this->debug->displayError($error, false);
753 753
           throw new DBConnectException($error, 101);
754 754
         }
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
         $this->connected = $this->doctrine_connection->isConnected();
766 766
 
767 767
         if (!$this->connected) {
768
-          $error = 'Error connecting to mysql server: ' . $this->doctrine_connection->errorInfo();
768
+          $error = 'Error connecting to mysql server: '.$this->doctrine_connection->errorInfo();
769 769
           $this->debug->displayError($error, false);
770 770
           throw new DBConnectException($error, 101);
771 771
         }
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
828 828
       );
829 829
 
830 830
     } catch (\Exception $e) {
831
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
831
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
832 832
       $this->debug->displayError($error, false);
833 833
       throw new DBConnectException($error, 100, $e);
834 834
     }
@@ -836,7 +836,7 @@  discard block
 block discarded – undo
836 836
 
837 837
     $errno = \mysqli_connect_errno();
838 838
     if (!$this->connected || $errno) {
839
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
839
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
840 840
       $this->debug->displayError($error, false);
841 841
       throw new DBConnectException($error, 101);
842 842
     }
@@ -877,10 +877,10 @@  discard block
 block discarded – undo
877 877
     }
878 878
 
879 879
     if ($databaseName) {
880
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
880
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
881 881
     }
882 882
 
883
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE)";
883
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE)";
884 884
 
885 885
     return $this->query($sql);
886 886
   }
@@ -1083,7 +1083,7 @@  discard block
 block discarded – undo
1083 1083
 
1084 1084
     if ($useCache === true) {
1085 1085
       $cache = new Cache(null, null, false, $useCache);
1086
-      $cacheKey = 'sql-' . \md5($query);
1086
+      $cacheKey = 'sql-'.\md5($query);
1087 1087
 
1088 1088
       if (
1089 1089
           $cache->getCacheIsReady() === true
@@ -1258,7 +1258,7 @@  discard block
 block discarded – undo
1258 1258
     }
1259 1259
 
1260 1260
     if (
1261
-        '' . $hostname . $username . $password . $database . $port . $charset == '' . $port . $charset
1261
+        ''.$hostname.$username.$password.$database.$port.$charset == ''.$port.$charset
1262 1262
         &&
1263 1263
         null !== $firstInstance
1264 1264
     ) {
@@ -1276,11 +1276,11 @@  discard block
 block discarded – undo
1276 1276
       } else {
1277 1277
         $extra_config_value_tmp = (string)$extra_config_value;
1278 1278
       }
1279
-      $extra_config_string .= $extra_config_key . $extra_config_value_tmp;
1279
+      $extra_config_string .= $extra_config_key.$extra_config_value_tmp;
1280 1280
     }
1281 1281
 
1282 1282
     $connection = \md5(
1283
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1283
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1284 1284
     );
1285 1285
 
1286 1286
     if (!isset($instance[$connection])) {
@@ -1420,10 +1420,10 @@  discard block
 block discarded – undo
1420 1420
     $SET = $this->_parseArrayPair($data);
1421 1421
 
1422 1422
     if ($databaseName) {
1423
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1423
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
1424 1424
     }
1425 1425
 
1426
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET";
1426
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET";
1427 1427
 
1428 1428
     return $this->query($sql);
1429 1429
   }
@@ -1937,11 +1937,11 @@  discard block
 block discarded – undo
1937 1937
 
1938 1938
       // exit if we have more then 3 "DB server has gone away"-errors
1939 1939
       if ($RECONNECT_COUNTER > 3) {
1940
-        $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
1940
+        $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1941 1941
         throw new DBGoneAwayException($errorMessage);
1942 1942
       }
1943 1943
 
1944
-      $this->debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1944
+      $this->debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1945 1945
 
1946 1946
       // reconnect
1947 1947
       $RECONNECT_COUNTER++;
@@ -1955,7 +1955,7 @@  discard block
 block discarded – undo
1955 1955
       return false;
1956 1956
     }
1957 1957
 
1958
-    $this->debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1958
+    $this->debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1959 1959
 
1960 1960
     $force_exception_after_error = null; // auto
1961 1961
     if ($this->in_transaction === true) {
@@ -1963,7 +1963,7 @@  discard block
 block discarded – undo
1963 1963
     }
1964 1964
     // this query returned an error, we must display it (only for dev) !!!
1965 1965
 
1966
-    $this->debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
1966
+    $this->debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
1967 1967
 
1968 1968
     return false;
1969 1969
   }
@@ -1986,7 +1986,7 @@  discard block
 block discarded – undo
1986 1986
         )
1987 1987
     );
1988 1988
 
1989
-    return '`' . $str . '`';
1989
+    return '`'.$str.'`';
1990 1990
   }
1991 1991
 
1992 1992
   /**
@@ -2056,10 +2056,10 @@  discard block
 block discarded – undo
2056 2056
     $values = \implode(',', $data);
2057 2057
 
2058 2058
     if ($databaseName) {
2059
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2059
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
2060 2060
     }
2061 2061
 
2062
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values)";
2062
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values)";
2063 2063
 
2064 2064
     return $this->query($sql);
2065 2065
   }
@@ -2203,7 +2203,7 @@  discard block
 block discarded – undo
2203 2203
     $var = $this->escape($var, false, false, null);
2204 2204
 
2205 2205
     if (\is_string($var)) {
2206
-      $var = "'" . \trim($var, "'") . "'";
2206
+      $var = "'".\trim($var, "'")."'";
2207 2207
     }
2208 2208
 
2209 2209
     return $var;
@@ -2240,10 +2240,10 @@  discard block
 block discarded – undo
2240 2240
     }
2241 2241
 
2242 2242
     if ($databaseName) {
2243
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2243
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
2244 2244
     }
2245 2245
 
2246
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE)";
2246
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE)";
2247 2247
 
2248 2248
     return $this->query($sql);
2249 2249
   }
@@ -2337,16 +2337,16 @@  discard block
 block discarded – undo
2337 2337
       $return = mysqli_set_charset($this->mysqli_link, $charset);
2338 2338
 
2339 2339
       /** @noinspection PhpUsageOfSilenceOperatorInspection */
2340
-      @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET ' . $charset);
2340
+      @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET '.$charset);
2341 2341
       /** @noinspection PhpUsageOfSilenceOperatorInspection */
2342
-      @\mysqli_query($this->mysqli_link, "SET NAMES '" . $charset . "'");
2342
+      @\mysqli_query($this->mysqli_link, "SET NAMES '".$charset."'");
2343 2343
 
2344 2344
     } elseif ($this->isDoctrinePDOConnection() === true) {
2345 2345
 
2346 2346
       $doctrineWrappedConnection = $this->getDoctrinePDOConnection();
2347 2347
 
2348
-      $doctrineWrappedConnection->exec('SET CHARACTER SET ' . $charset);
2349
-      $doctrineWrappedConnection->exec("SET NAMES '" . $charset . "'");
2348
+      $doctrineWrappedConnection->exec('SET CHARACTER SET '.$charset);
2349
+      $doctrineWrappedConnection->exec("SET NAMES '".$charset."'");
2350 2350
 
2351 2351
       $return = true;
2352 2352
 
@@ -2483,7 +2483,7 @@  discard block
 block discarded – undo
2483 2483
    */
2484 2484
   public function table_exists(string $table): bool
2485 2485
   {
2486
-    $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
2486
+    $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
2487 2487
 
2488 2488
     return $check !== false
2489 2489
            &&
@@ -2514,7 +2514,7 @@  discard block
 block discarded – undo
2514 2514
       $result = $callback($this);
2515 2515
       if ($result === false) {
2516 2516
         /** @noinspection ThrowRawExceptionInspection */
2517
-        throw new \Exception('call_user_func [' . $callback . '] === false');
2517
+        throw new \Exception('call_user_func ['.$callback.'] === false');
2518 2518
       }
2519 2519
 
2520 2520
       return $this->commit();
@@ -2567,10 +2567,10 @@  discard block
 block discarded – undo
2567 2567
     }
2568 2568
 
2569 2569
     if ($databaseName) {
2570
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2570
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
2571 2571
     }
2572 2572
 
2573
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE)";
2573
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE)";
2574 2574
 
2575 2575
     return $this->query($sql);
2576 2576
   }
Please login to merge, or discard this patch.