Completed
Push — master ( 46623e...0d11f8 )
by Lars
02:05
created
src/voku/db/DB.php 1 patch
Spacing   +55 added lines, -55 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
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
         foreach ($arrayPair as $_key => $_value) {
374 374
             $_connector = '=';
375 375
             $_glueHelper = '';
376
-            $_key_upper = \strtoupper((string) $_key);
376
+            $_key_upper = \strtoupper((string)$_key);
377 377
 
378 378
             if (\strpos($_key_upper, ' NOT') !== false) {
379 379
                 $_connector = 'NOT';
@@ -455,30 +455,30 @@  discard block
 block discarded – undo
455 455
                 }
456 456
 
457 457
                 if ($_connector === 'NOT IN' || $_connector === 'IN') {
458
-                    $_value = '(' . \implode(',', $_value) . ')';
458
+                    $_value = '('.\implode(',', $_value).')';
459 459
                 } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
460
-                    $_value = '(' . \implode(' AND ', $_value) . ')';
460
+                    $_value = '('.\implode(' AND ', $_value).')';
461 461
                 } elseif ($firstKey && $firstValue) {
462
-                    if (\strpos((string) $firstKey, ' +') !== false) {
463
-                        $firstKey = \str_replace(' +', '', (string) $firstKey);
464
-                        $_value = $firstKey . ' + ' . $firstValue;
462
+                    if (\strpos((string)$firstKey, ' +') !== false) {
463
+                        $firstKey = \str_replace(' +', '', (string)$firstKey);
464
+                        $_value = $firstKey.' + '.$firstValue;
465 465
                     }
466 466
 
467
-                    if (\strpos((string) $firstKey, ' -') !== false) {
468
-                        $firstKey = \str_replace(' -', '', (string) $firstKey);
469
-                        $_value = $firstKey . ' - ' . $firstValue;
467
+                    if (\strpos((string)$firstKey, ' -') !== false) {
468
+                        $firstKey = \str_replace(' -', '', (string)$firstKey);
469
+                        $_value = $firstKey.' - '.$firstValue;
470 470
                     }
471 471
                 }
472 472
             } else {
473 473
                 $_value = $this->secure($_value);
474 474
             }
475 475
 
476
-            $_key = UTF8::str_replace_last($_glueHelper, '', (string) $_key);
476
+            $_key = UTF8::str_replace_last($_glueHelper, '', (string)$_key);
477 477
             $_key = UTF8::str_replace_last($_connector, '', $_key);
478 478
 
479 479
             $quoteString = $this->quote_string(\trim($_key));
480 480
 
481
-            $_value = (array) $_value;
481
+            $_value = (array)$_value;
482 482
 
483 483
             if (!$_glueHelper) {
484 484
                 $_glueHelper = $glue;
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
                     $valueInner = "''";
503 503
                 }
504 504
 
505
-                $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
505
+                $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
506 506
                 $tmpCounter++;
507 507
             }
508 508
 
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
             unset($params[$key]);
555 555
 
556 556
             $sql = \substr_replace($sql, $replacement, $offset, 1);
557
-            $offset = \strpos($sql, '?', $offset + \strlen((string) $replacement));
557
+            $offset = \strpos($sql, '?', $offset + \strlen((string)$replacement));
558 558
         }
559 559
 
560 560
         return ['sql' => $sql, 'params' => $params];
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
 
592 592
             // add ":" if needed
593 593
             if (\strpos($name, ':') !== 0) {
594
-                $nameTmp = ':' . $name;
594
+                $nameTmp = ':'.$name;
595 595
             } else {
596 596
                 $nameTmp = $name;
597 597
             }
@@ -599,7 +599,7 @@  discard block
 block discarded – undo
599 599
             if ($offset === null) {
600 600
                 $offset = \strpos($sql, $nameTmp);
601 601
             } else {
602
-                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string) $replacement));
602
+                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string)$replacement));
603 603
             }
604 604
 
605 605
             if ($offset === false) {
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
             return \mysqli_affected_rows($this->mysqli_link);
632 632
         }
633 633
 
634
-        return (int) $this->affected_rows;
634
+        return (int)$this->affected_rows;
635 635
     }
636 636
 
637 637
     /**
@@ -845,10 +845,10 @@  discard block
 block discarded – undo
845 845
                 $this->database,
846 846
                 $this->port,
847 847
                 $this->socket,
848
-                (int) $flags
848
+                (int)$flags
849 849
             );
850 850
         } catch (\Exception $e) {
851
-            $error = 'Error connecting to mysql server: ' . $e->getMessage();
851
+            $error = 'Error connecting to mysql server: '.$e->getMessage();
852 852
             $this->debug->displayError($error, false);
853 853
 
854 854
             throw new DBConnectException($error, 100, $e);
@@ -857,7 +857,7 @@  discard block
 block discarded – undo
857 857
 
858 858
         $errno = \mysqli_connect_errno();
859 859
         if (!$this->connected || $errno) {
860
-            $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
860
+            $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
861 861
             $this->debug->displayError($error, false);
862 862
 
863 863
             throw new DBConnectException($error, 101);
@@ -880,7 +880,7 @@  discard block
 block discarded – undo
880 880
         }
881 881
 
882 882
         if (!$this->connected) {
883
-            $error = 'Error connecting to mysql server: ' . \print_r($this->doctrine_connection ? $this->doctrine_connection->errorInfo() : [], false);
883
+            $error = 'Error connecting to mysql server: '.\print_r($this->doctrine_connection ? $this->doctrine_connection->errorInfo() : [], false);
884 884
             $this->debug->displayError($error, false);
885 885
 
886 886
             throw new DBConnectException($error, 101);
@@ -926,10 +926,10 @@  discard block
 block discarded – undo
926 926
         }
927 927
 
928 928
         if ($databaseName) {
929
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
929
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
930 930
         }
931 931
 
932
-        $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE (${WHERE})";
932
+        $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE (${WHERE})";
933 933
 
934 934
         $return = $this->query($sql);
935 935
 
@@ -1030,14 +1030,14 @@  discard block
 block discarded – undo
1030 1030
                 $var = $var->format('Y-m-d H:i:s');
1031 1031
                 $type = 'string';
1032 1032
             } elseif (\method_exists($var, '__toString')) {
1033
-                $var = (string) $var;
1033
+                $var = (string)$var;
1034 1034
                 $type = 'string';
1035 1035
             }
1036 1036
         }
1037 1037
 
1038 1038
         switch ($type) {
1039 1039
             case 'boolean':
1040
-                $var = (int) $var;
1040
+                $var = (int)$var;
1041 1041
 
1042 1042
                 break;
1043 1043
 
@@ -1081,7 +1081,7 @@  discard block
 block discarded – undo
1081 1081
                     }
1082 1082
                 } else {
1083 1083
                     $varCleaned = [];
1084
-                    foreach ((array) $var as $key => $value) {
1084
+                    foreach ((array)$var as $key => $value) {
1085 1085
                         $key = $this->escape($key, $stripe_non_utf8, $html_entity_decode);
1086 1086
                         $value = $this->escape($value, $stripe_non_utf8, $html_entity_decode);
1087 1087
 
@@ -1145,7 +1145,7 @@  discard block
 block discarded – undo
1145 1145
 
1146 1146
         if ($useCache) {
1147 1147
             $cache = new \voku\cache\Cache(null, null, false, $useCache);
1148
-            $cacheKey = 'sql-' . \md5($query);
1148
+            $cacheKey = 'sql-'.\md5($query);
1149 1149
 
1150 1150
             if (
1151 1151
                 $cache->getCacheIsReady()
@@ -1321,7 +1321,7 @@  discard block
 block discarded – undo
1321 1321
         }
1322 1322
 
1323 1323
         if (
1324
-            '' . $hostname . $username . $password . $database . $port . $charset === '' . $port . $charset
1324
+            ''.$hostname.$username.$password.$database.$port.$charset === ''.$port.$charset
1325 1325
             &&
1326 1326
             $firstInstance instanceof self
1327 1327
         ) {
@@ -1337,13 +1337,13 @@  discard block
 block discarded – undo
1337 1337
             if (\is_object($extra_config_value)) {
1338 1338
                 $extra_config_value_tmp = \spl_object_hash($extra_config_value);
1339 1339
             } else {
1340
-                $extra_config_value_tmp = (string) $extra_config_value;
1340
+                $extra_config_value_tmp = (string)$extra_config_value;
1341 1341
             }
1342
-            $extra_config_string .= $extra_config_key . $extra_config_value_tmp;
1342
+            $extra_config_string .= $extra_config_key.$extra_config_value_tmp;
1343 1343
         }
1344 1344
 
1345 1345
         $connection = \md5(
1346
-            $hostname . $username . $password . $database . $port . $charset . (int) $exit_on_error . (int) $echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1346
+            $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1347 1347
         );
1348 1348
 
1349 1349
         if (!isset($instance[$connection])) {
@@ -1486,10 +1486,10 @@  discard block
 block discarded – undo
1486 1486
         $SET = $this->_parseArrayPair($data);
1487 1487
 
1488 1488
         if ($databaseName) {
1489
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1489
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
1490 1490
         }
1491 1491
 
1492
-        $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET ${SET}";
1492
+        $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET ${SET}";
1493 1493
 
1494 1494
         $return = $this->query($sql);
1495 1495
         if ($return === false) {
@@ -2072,12 +2072,12 @@  discard block
 block discarded – undo
2072 2072
 
2073 2073
             // exit if we have more then 3 "DB server has gone away"-errors
2074 2074
             if ($RECONNECT_COUNTER > 3) {
2075
-                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
2075
+                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
2076 2076
 
2077 2077
                 throw new DBGoneAwayException($errorMessage);
2078 2078
             }
2079 2079
 
2080
-            $this->debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
2080
+            $this->debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
2081 2081
 
2082 2082
             // reconnect
2083 2083
             $RECONNECT_COUNTER++;
@@ -2091,7 +2091,7 @@  discard block
 block discarded – undo
2091 2091
             return false;
2092 2092
         }
2093 2093
 
2094
-        $this->debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
2094
+        $this->debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
2095 2095
 
2096 2096
         if (
2097 2097
             $force_exception_after_error === null
@@ -2102,7 +2102,7 @@  discard block
 block discarded – undo
2102 2102
         }
2103 2103
 
2104 2104
         // this query returned an error, we must display it (only for dev) !!!
2105
-        $this->debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
2105
+        $this->debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
2106 2106
 
2107 2107
         return false;
2108 2108
     }
@@ -2120,12 +2120,12 @@  discard block
 block discarded – undo
2120 2120
             '`',
2121 2121
             '``',
2122 2122
             \trim(
2123
-                (string) $this->escape($str, false),
2123
+                (string)$this->escape($str, false),
2124 2124
                 '`'
2125 2125
             )
2126 2126
         );
2127 2127
 
2128
-        return '`' . $str . '`';
2128
+        return '`'.$str.'`';
2129 2129
     }
2130 2130
 
2131 2131
     /**
@@ -2194,10 +2194,10 @@  discard block
 block discarded – undo
2194 2194
         $values = \implode(',', $data);
2195 2195
 
2196 2196
         if ($databaseName) {
2197
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2197
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2198 2198
         }
2199 2199
 
2200
-        $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " (${columns}) VALUES (${values})";
2200
+        $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." (${columns}) VALUES (${values})";
2201 2201
 
2202 2202
         $return = $this->query($sql);
2203 2203
         \assert(\is_int($return) || $return === false);
@@ -2296,7 +2296,7 @@  discard block
 block discarded – undo
2296 2296
                 }
2297 2297
             } else {
2298 2298
                 $varCleaned = [];
2299
-                foreach ((array) $var as $key => $value) {
2299
+                foreach ((array)$var as $key => $value) {
2300 2300
                     $key = $this->escape($key, false, false, $convert_array);
2301 2301
                     $value = $this->secure($value);
2302 2302
 
@@ -2343,7 +2343,7 @@  discard block
 block discarded – undo
2343 2343
         $var = $this->escape($var, false, false, null);
2344 2344
 
2345 2345
         if (\is_string($var)) {
2346
-            $var = "'" . \trim($var, "'") . "'";
2346
+            $var = "'".\trim($var, "'")."'";
2347 2347
         }
2348 2348
 
2349 2349
         return $var;
@@ -2384,10 +2384,10 @@  discard block
 block discarded – undo
2384 2384
         }
2385 2385
 
2386 2386
         if ($databaseName) {
2387
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2387
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2388 2388
         }
2389 2389
 
2390
-        $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE (${WHERE})";
2390
+        $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE (${WHERE})";
2391 2391
 
2392 2392
         $return = $this->query($sql);
2393 2393
         \assert($return instanceof Result || $return === false);
@@ -2440,7 +2440,7 @@  discard block
 block discarded – undo
2440 2440
     public function setConfigExtra(array $extra_config)
2441 2441
     {
2442 2442
         if (isset($extra_config['session_to_db'])) {
2443
-            $this->session_to_db = (bool) $extra_config['session_to_db'];
2443
+            $this->session_to_db = (bool)$extra_config['session_to_db'];
2444 2444
         }
2445 2445
 
2446 2446
         if (isset($extra_config['doctrine'])) {
@@ -2503,9 +2503,9 @@  discard block
 block discarded – undo
2503 2503
             $return = \mysqli_set_charset($this->mysqli_link, $charset);
2504 2504
 
2505 2505
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2506
-            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET ' . $charset);
2506
+            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET '.$charset);
2507 2507
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2508
-            @\mysqli_query($this->mysqli_link, "SET NAMES '" . $charset . "'");
2508
+            @\mysqli_query($this->mysqli_link, "SET NAMES '".$charset."'");
2509 2509
         } elseif ($this->doctrine_connection && $this->isDoctrinePDOConnection()) {
2510 2510
             $doctrineWrappedConnection = $this->getDoctrinePDOConnection();
2511 2511
             if (!$doctrineWrappedConnection instanceof \Doctrine\DBAL\Connection) {
@@ -2513,9 +2513,9 @@  discard block
 block discarded – undo
2513 2513
             }
2514 2514
 
2515 2515
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2516
-            @$doctrineWrappedConnection->exec('SET CHARACTER SET ' . $charset);
2516
+            @$doctrineWrappedConnection->exec('SET CHARACTER SET '.$charset);
2517 2517
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2518
-            @$doctrineWrappedConnection->exec("SET NAMES '" . $charset . "'");
2518
+            @$doctrineWrappedConnection->exec("SET NAMES '".$charset."'");
2519 2519
 
2520 2520
             $return = true;
2521 2521
         } else {
@@ -2656,7 +2656,7 @@  discard block
 block discarded – undo
2656 2656
      */
2657 2657
     public function table_exists(string $table): bool
2658 2658
     {
2659
-        $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
2659
+        $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
2660 2660
 
2661 2661
         return $check !== false
2662 2662
                &&
@@ -2687,7 +2687,7 @@  discard block
 block discarded – undo
2687 2687
             $result = $callback($this);
2688 2688
             if ($result === false) {
2689 2689
                 /** @noinspection ThrowRawExceptionInspection */
2690
-                throw new \Exception('call_user_func [' . \print_r($callback, true) . '] === false');
2690
+                throw new \Exception('call_user_func ['.\print_r($callback, true).'] === false');
2691 2691
             }
2692 2692
 
2693 2693
             return $this->commit();
@@ -2749,10 +2749,10 @@  discard block
 block discarded – undo
2749 2749
         }
2750 2750
 
2751 2751
         if ($databaseName) {
2752
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2752
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2753 2753
         }
2754 2754
 
2755
-        $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET ${SET} WHERE (${WHERE})";
2755
+        $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET ${SET} WHERE (${WHERE})";
2756 2756
 
2757 2757
         $return = $this->query($sql);
2758 2758
         \assert(\is_int($return) || $return === false);
Please login to merge, or discard this patch.