Completed
Push — master ( 359a2b...7a32dd )
by Lars
28:45 queued 13:50
created
src/voku/db/DB.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -317,10 +317,10 @@  discard block
 block discarded – undo
317 317
         }
318 318
 
319 319
         if ($port) {
320
-            $this->port = (int) $port;
320
+            $this->port = (int)$port;
321 321
         } else {
322 322
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
323
-            $this->port = (int) @\ini_get('mysqli.default_port');
323
+            $this->port = (int)@\ini_get('mysqli.default_port');
324 324
         }
325 325
 
326 326
         // fallback
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
         foreach ($arrayPair as $_key => $_value) {
375 375
             $_connector = '=';
376 376
             $_glueHelper = '';
377
-            $_key_upper = \strtoupper((string) $_key);
377
+            $_key_upper = \strtoupper((string)$_key);
378 378
 
379 379
             if (\strpos($_key_upper, ' NOT') !== false) {
380 380
                 $_connector = 'NOT';
@@ -457,30 +457,30 @@  discard block
 block discarded – undo
457 457
                 }
458 458
 
459 459
                 if ($_connector === 'NOT IN' || $_connector === 'IN') {
460
-                    $_value = '(' . \implode(',', $_value) . ')';
460
+                    $_value = '('.\implode(',', $_value).')';
461 461
                 } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
462
-                    $_value = '(' . \implode(' AND ', $_value) . ')';
462
+                    $_value = '('.\implode(' AND ', $_value).')';
463 463
                 } elseif ($firstKey && $firstValue) {
464
-                    if (\strpos((string) $firstKey, ' +') !== false) {
465
-                        $firstKey = \str_replace(' +', '', (string) $firstKey);
466
-                        $_value = $firstKey . ' + ' . $firstValue;
464
+                    if (\strpos((string)$firstKey, ' +') !== false) {
465
+                        $firstKey = \str_replace(' +', '', (string)$firstKey);
466
+                        $_value = $firstKey.' + '.$firstValue;
467 467
                     }
468 468
 
469
-                    if (\strpos((string) $firstKey, ' -') !== false) {
470
-                        $firstKey = \str_replace(' -', '', (string) $firstKey);
471
-                        $_value = $firstKey . ' - ' . $firstValue;
469
+                    if (\strpos((string)$firstKey, ' -') !== false) {
470
+                        $firstKey = \str_replace(' -', '', (string)$firstKey);
471
+                        $_value = $firstKey.' - '.$firstValue;
472 472
                     }
473 473
                 }
474 474
             } else {
475 475
                 $_value = $this->secure($_value);
476 476
             }
477 477
 
478
-            $_key = UTF8::str_replace_last($_glueHelper, '', (string) $_key);
478
+            $_key = UTF8::str_replace_last($_glueHelper, '', (string)$_key);
479 479
             $_key = UTF8::str_replace_last($_connector, '', $_key);
480 480
 
481 481
             $quoteString = $this->quote_string(\trim($_key));
482 482
 
483
-            $_value = (array) $_value;
483
+            $_value = (array)$_value;
484 484
 
485 485
             if (!$_glueHelper) {
486 486
                 $_glueHelper = $glue;
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
                     $valueInner = "''";
505 505
                 }
506 506
 
507
-                $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
507
+                $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
508 508
                 $tmpCounter++;
509 509
             }
510 510
 
@@ -556,8 +556,8 @@  discard block
 block discarded – undo
556 556
 
557 557
             unset($params[$key]);
558 558
 
559
-            $sql = \substr_replace($sql, (string) $replacement, $offset, 1);
560
-            $offset = \strpos($sql, '?', $offset + \strlen((string) $replacement));
559
+            $sql = \substr_replace($sql, (string)$replacement, $offset, 1);
560
+            $offset = \strpos($sql, '?', $offset + \strlen((string)$replacement));
561 561
         }
562 562
 
563 563
         return ['sql' => $sql, 'params' => $params];
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
 
595 595
             // add ":" if needed
596 596
             if (\strpos($name, ':') !== 0) {
597
-                $nameTmp = ':' . $name;
597
+                $nameTmp = ':'.$name;
598 598
             } else {
599 599
                 $nameTmp = $name;
600 600
             }
@@ -602,7 +602,7 @@  discard block
 block discarded – undo
602 602
             if ($offset === null) {
603 603
                 $offset = \strpos($sql, $nameTmp);
604 604
             } else {
605
-                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string) $replacement));
605
+                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string)$replacement));
606 606
             }
607 607
 
608 608
             if ($offset === false) {
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 
615 615
             unset($params[$name]);
616 616
 
617
-            $sql = \substr_replace($sql, (string) $replacement, $offset, \strlen($nameTmp));
617
+            $sql = \substr_replace($sql, (string)$replacement, $offset, \strlen($nameTmp));
618 618
         }
619 619
 
620 620
         return ['sql' => $sql, 'params' => $params];
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
             return \mysqli_affected_rows($this->mysqli_link);
636 636
         }
637 637
 
638
-        return (int) $this->affected_rows;
638
+        return (int)$this->affected_rows;
639 639
     }
640 640
 
641 641
     /**
@@ -852,10 +852,10 @@  discard block
 block discarded – undo
852 852
                 $this->database,
853 853
                 $this->port,
854 854
                 $this->socket,
855
-                (int) $flags
855
+                (int)$flags
856 856
             );
857 857
         } catch (\Exception $e) {
858
-            $error = 'Error connecting to mysql server: ' . $e->getMessage();
858
+            $error = 'Error connecting to mysql server: '.$e->getMessage();
859 859
             $this->debug->displayError($error, false);
860 860
 
861 861
             throw new DBConnectException($error, 100, $e);
@@ -864,7 +864,7 @@  discard block
 block discarded – undo
864 864
 
865 865
         $errno = \mysqli_connect_errno();
866 866
         if (!$this->connected || $errno) {
867
-            $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
867
+            $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
868 868
             $this->debug->displayError($error, false);
869 869
 
870 870
             throw new DBConnectException($error, 101);
@@ -887,7 +887,7 @@  discard block
 block discarded – undo
887 887
         }
888 888
 
889 889
         if (!$this->connected) {
890
-            $error = 'Error connecting to mysql server: ' . \print_r($this->doctrine_connection ? $this->doctrine_connection->errorInfo() : [], false);
890
+            $error = 'Error connecting to mysql server: '.\print_r($this->doctrine_connection ? $this->doctrine_connection->errorInfo() : [], false);
891 891
             $this->debug->displayError($error, false);
892 892
 
893 893
             throw new DBConnectException($error, 101);
@@ -934,10 +934,10 @@  discard block
 block discarded – undo
934 934
         }
935 935
 
936 936
         if ($databaseName) {
937
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
937
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
938 938
         }
939 939
 
940
-        $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . ' WHERE (' . $WHERE . ')';
940
+        $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table).' WHERE ('.$WHERE.')';
941 941
 
942 942
         $return = $this->query($sql);
943 943
 
@@ -1042,7 +1042,7 @@  discard block
 block discarded – undo
1042 1042
                 $var = $var->format('Y-m-d H:i:s');
1043 1043
                 $type = 'string';
1044 1044
             } elseif (\method_exists($var, '__toString')) {
1045
-                $var = (string) $var;
1045
+                $var = (string)$var;
1046 1046
                 $type = 'string';
1047 1047
             }
1048 1048
         }
@@ -1053,7 +1053,7 @@  discard block
 block discarded – undo
1053 1053
                 /** @var bool $var */
1054 1054
                 $var = $var;
1055 1055
 
1056
-                $var = (int) $var;
1056
+                $var = (int)$var;
1057 1057
 
1058 1058
                 break;
1059 1059
 
@@ -1098,7 +1098,7 @@  discard block
 block discarded – undo
1098 1098
                     }
1099 1099
                 } else {
1100 1100
                     $varCleaned = [];
1101
-                    foreach ((array) $var as $key => $value) {
1101
+                    foreach ((array)$var as $key => $value) {
1102 1102
                         /** @var string $key */
1103 1103
                         $key = $this->escape($key, $stripe_non_utf8, $html_entity_decode);
1104 1104
                         /** @var string $value */
@@ -1168,7 +1168,7 @@  discard block
 block discarded – undo
1168 1168
 
1169 1169
         if ($useCache) {
1170 1170
             $cache = new \voku\cache\Cache(null, null, false, $useCache);
1171
-            $cacheKey = 'sql-' . \md5($query);
1171
+            $cacheKey = 'sql-'.\md5($query);
1172 1172
 
1173 1173
             if (
1174 1174
                 $cache->getCacheIsReady()
@@ -1344,7 +1344,7 @@  discard block
 block discarded – undo
1344 1344
         }
1345 1345
 
1346 1346
         if (
1347
-            '' . $hostname . $username . $password . $database . $port . $charset === '' . $port . $charset
1347
+            ''.$hostname.$username.$password.$database.$port.$charset === ''.$port.$charset
1348 1348
             &&
1349 1349
             $firstInstance instanceof self
1350 1350
         ) {
@@ -1360,13 +1360,13 @@  discard block
 block discarded – undo
1360 1360
             if (\is_object($extra_config_value)) {
1361 1361
                 $extra_config_value_tmp = \spl_object_hash($extra_config_value);
1362 1362
             } else {
1363
-                $extra_config_value_tmp = (string) $extra_config_value;
1363
+                $extra_config_value_tmp = (string)$extra_config_value;
1364 1364
             }
1365
-            $extra_config_string .= $extra_config_key . $extra_config_value_tmp;
1365
+            $extra_config_string .= $extra_config_key.$extra_config_value_tmp;
1366 1366
         }
1367 1367
 
1368 1368
         $connection = \md5(
1369
-            $hostname . $username . $password . $database . $port . $charset . (int) $exit_on_error . (int) $echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1369
+            $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1370 1370
         );
1371 1371
 
1372 1372
         if (!isset($instance[$connection])) {
@@ -1509,10 +1509,10 @@  discard block
 block discarded – undo
1509 1509
         $SET = $this->_parseArrayPair($data);
1510 1510
 
1511 1511
         if ($databaseName) {
1512
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1512
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
1513 1513
         }
1514 1514
 
1515
-        $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . ' SET ' . $SET;
1515
+        $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table).' SET '.$SET;
1516 1516
 
1517 1517
         $return = $this->query($sql);
1518 1518
         if ($return === false) {
@@ -1686,7 +1686,7 @@  discard block
 block discarded – undo
1686 1686
                         $errorCode = 1;
1687 1687
                     }
1688 1688
 
1689
-                    return $this->queryErrorHandling($queryException->getMessage(), (int) $errorCode, $sql, false, true);
1689
+                    return $this->queryErrorHandling($queryException->getMessage(), (int)$errorCode, $sql, false, true);
1690 1690
                 }
1691 1691
             }
1692 1692
         } elseif ($this->mysqli_link) {
@@ -2032,7 +2032,7 @@  discard block
 block discarded – undo
2032 2032
                 $errorCode = 1;
2033 2033
             }
2034 2034
 
2035
-            return $this->queryErrorHandling($queryException->getMessage(), (int) $errorCode, $sql, $params);
2035
+            return $this->queryErrorHandling($queryException->getMessage(), (int)$errorCode, $sql, $params);
2036 2036
         }
2037 2037
 
2038 2038
         if ($this->mysqli_link) {
@@ -2121,12 +2121,12 @@  discard block
 block discarded – undo
2121 2121
 
2122 2122
             // exit if we have more then 3 "DB server has gone away"-errors
2123 2123
             if ($RECONNECT_COUNTER > 3) {
2124
-                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
2124
+                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
2125 2125
 
2126 2126
                 throw new DBGoneAwayException($errorMessage);
2127 2127
             }
2128 2128
 
2129
-            $this->debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
2129
+            $this->debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
2130 2130
 
2131 2131
             // reconnect
2132 2132
             $RECONNECT_COUNTER++;
@@ -2140,7 +2140,7 @@  discard block
 block discarded – undo
2140 2140
             return false;
2141 2141
         }
2142 2142
 
2143
-        $this->debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
2143
+        $this->debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
2144 2144
 
2145 2145
         if (
2146 2146
             $force_exception_after_error === null
@@ -2151,7 +2151,7 @@  discard block
 block discarded – undo
2151 2151
         }
2152 2152
 
2153 2153
         // this query returned an error, we must display it (only for dev) !!!
2154
-        $this->debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
2154
+        $this->debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
2155 2155
 
2156 2156
         return false;
2157 2157
     }
@@ -2172,12 +2172,12 @@  discard block
 block discarded – undo
2172 2172
             '`',
2173 2173
             '``',
2174 2174
             \trim(
2175
-                (string) $str,
2175
+                (string)$str,
2176 2176
                 '`'
2177 2177
             )
2178 2178
         );
2179 2179
 
2180
-        return '`' . $str . '`';
2180
+        return '`'.$str.'`';
2181 2181
     }
2182 2182
 
2183 2183
     /**
@@ -2246,10 +2246,10 @@  discard block
 block discarded – undo
2246 2246
         $values = \implode(',', $data);
2247 2247
 
2248 2248
         if ($databaseName) {
2249
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2249
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2250 2250
         }
2251 2251
 
2252
-        $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . ' (' . $columns . ') VALUES (' . $values . ')';
2252
+        $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table).' ('.$columns.') VALUES ('.$values.')';
2253 2253
 
2254 2254
         $return = $this->query($sql);
2255 2255
         \assert(\is_int($return) || $return === false);
@@ -2348,7 +2348,7 @@  discard block
 block discarded – undo
2348 2348
                 }
2349 2349
             } else {
2350 2350
                 $varCleaned = [];
2351
-                foreach ((array) $var as $key => $value) {
2351
+                foreach ((array)$var as $key => $value) {
2352 2352
                     /** @var string $key */
2353 2353
                     $key = $this->escape($key, false, false, $convert_array);
2354 2354
                     /** @var float|int|string $value */
@@ -2396,7 +2396,7 @@  discard block
 block discarded – undo
2396 2396
         $var = $this->escape($var, false, false, null);
2397 2397
 
2398 2398
         if (\is_string($var)) {
2399
-            $var = "'" . \trim($var, "'") . "'";
2399
+            $var = "'".\trim($var, "'")."'";
2400 2400
         }
2401 2401
 
2402 2402
         return $var;
@@ -2438,10 +2438,10 @@  discard block
 block discarded – undo
2438 2438
         }
2439 2439
 
2440 2440
         if ($databaseName) {
2441
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2441
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2442 2442
         }
2443 2443
 
2444
-        $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . ' WHERE (' . $WHERE . ')';
2444
+        $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table).' WHERE ('.$WHERE.')';
2445 2445
 
2446 2446
         $return = $this->query($sql);
2447 2447
         \assert($return instanceof Result || $return === false);
@@ -2494,7 +2494,7 @@  discard block
 block discarded – undo
2494 2494
     public function setConfigExtra(array $extra_config)
2495 2495
     {
2496 2496
         if (isset($extra_config['session_to_db'])) {
2497
-            $this->session_to_db = (bool) $extra_config['session_to_db'];
2497
+            $this->session_to_db = (bool)$extra_config['session_to_db'];
2498 2498
         }
2499 2499
 
2500 2500
         if (isset($extra_config['doctrine'])) {
@@ -2557,9 +2557,9 @@  discard block
 block discarded – undo
2557 2557
             $return = \mysqli_set_charset($this->mysqli_link, $charset);
2558 2558
 
2559 2559
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2560
-            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET ' . $charset);
2560
+            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET '.$charset);
2561 2561
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2562
-            @\mysqli_query($this->mysqli_link, "SET NAMES '" . $charset . "'");
2562
+            @\mysqli_query($this->mysqli_link, "SET NAMES '".$charset."'");
2563 2563
         } elseif ($this->doctrine_connection && $this->isDoctrinePDOConnection()) {
2564 2564
             $doctrineWrappedConnection = $this->getDoctrinePDOConnection();
2565 2565
             if (!$doctrineWrappedConnection instanceof \Doctrine\DBAL\Connection) {
@@ -2567,9 +2567,9 @@  discard block
 block discarded – undo
2567 2567
             }
2568 2568
 
2569 2569
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2570
-            @$doctrineWrappedConnection->exec('SET CHARACTER SET ' . $charset);
2570
+            @$doctrineWrappedConnection->exec('SET CHARACTER SET '.$charset);
2571 2571
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2572
-            @$doctrineWrappedConnection->exec("SET NAMES '" . $charset . "'");
2572
+            @$doctrineWrappedConnection->exec("SET NAMES '".$charset."'");
2573 2573
 
2574 2574
             $return = true;
2575 2575
         } else {
@@ -2710,7 +2710,7 @@  discard block
 block discarded – undo
2710 2710
      */
2711 2711
     public function table_exists(string $table): bool
2712 2712
     {
2713
-        $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
2713
+        $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
2714 2714
 
2715 2715
         return $check !== false
2716 2716
                &&
@@ -2741,7 +2741,7 @@  discard block
 block discarded – undo
2741 2741
             $result = $callback($this);
2742 2742
             if ($result === false) {
2743 2743
                 /** @noinspection ThrowRawExceptionInspection */
2744
-                throw new \Exception('call_user_func [' . \print_r($callback, true) . '] === false');
2744
+                throw new \Exception('call_user_func ['.\print_r($callback, true).'] === false');
2745 2745
             }
2746 2746
 
2747 2747
             return $this->commit();
@@ -2804,10 +2804,10 @@  discard block
 block discarded – undo
2804 2804
         }
2805 2805
 
2806 2806
         if ($databaseName) {
2807
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2807
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2808 2808
         }
2809 2809
 
2810
-        $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . ' SET ' . $SET . ' WHERE (' . $WHERE . ')';
2810
+        $sql = 'UPDATE '.$databaseName.$this->quote_string($table).' SET '.$SET.' WHERE ('.$WHERE.')';
2811 2811
 
2812 2812
         $return = $this->query($sql);
2813 2813
         \assert(\is_int($return) || $return === false);
Please login to merge, or discard this patch.