Completed
Push — master ( e0388a...feeff1 )
by Lars
16:48
created
src/voku/db/Helper.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
         $configOrig = $dbConnection->getConfig();
23 23
         \array_walk_recursive(
24 24
             $configOrig,
25
-            static function ($k, $v) use (&$configTmp) {
25
+            static function($k, $v) use (&$configTmp) {
26 26
                 $configTmp[] = $v;
27 27
                 $configTmp[] = $k;
28 28
             }
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
         $optimized = 0;
49 49
         if (!empty($tables)) {
50 50
             foreach ($tables as $table) {
51
-                $optimize = 'OPTIMIZE TABLE ' . $dbConnection->quote_string($table);
51
+                $optimize = 'OPTIMIZE TABLE '.$dbConnection->quote_string($table);
52 52
                 $result = $dbConnection->query($optimize);
53 53
                 if ($result) {
54 54
                     $optimized++;
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
         $optimized = 0;
77 77
         if (!empty($tables)) {
78 78
             foreach ($tables as $table) {
79
-                $optimize = 'REPAIR TABLE ' . $dbConnection->quote_string($table);
79
+                $optimize = 'REPAIR TABLE '.$dbConnection->quote_string($table);
80 80
                 $result = $dbConnection->query($optimize);
81 81
                 if ($result) {
82 82
                     $optimized++;
@@ -210,23 +210,23 @@  discard block
 block discarded – undo
210 210
 
211 211
         $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
212 212
         if ($whereSQL) {
213
-            $whereSQL = 'AND ' . $whereSQL;
213
+            $whereSQL = 'AND '.$whereSQL;
214 214
         }
215 215
 
216 216
         if ($databaseName) {
217
-            $databaseName = $dbConnection->quote_string(\trim($databaseName)) . '.';
217
+            $databaseName = $dbConnection->quote_string(\trim($databaseName)).'.';
218 218
         }
219 219
 
220 220
         // get the row
221
-        $query = 'SELECT ' . $dbConnection->quote_string($searchFieldName) . ', ' . $dbConnection->quote_string($idFieldName) . ' 
222
-          FROM ' . $databaseName . $dbConnection->quote_string($table) . '
221
+        $query = 'SELECT '.$dbConnection->quote_string($searchFieldName).', '.$dbConnection->quote_string($idFieldName).' 
222
+          FROM ' . $databaseName.$dbConnection->quote_string($table).'
223 223
           WHERE 1 = 1
224
-          ' . $whereSQL . '
224
+          ' . $whereSQL.'
225 225
         ';
226 226
 
227 227
         if ($useCache) {
228 228
             $cache = new \voku\cache\Cache(null, null, false, $useCache);
229
-            $cacheKey = 'sql-phonetic-search-' . \md5($query);
229
+            $cacheKey = 'sql-phonetic-search-'.\md5($query);
230 230
 
231 231
             if (
232 232
                 $cache->getCacheIsReady()
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
         }
311 311
 
312 312
         /** @noinspection PhpParamsInspection - false-positiv | https://github.com/voku/simple-mysqli/issues/50 */
313
-        return $MYSQL_CLIENT_VERSION_CACHE[$cacheKey] = (string) \mysqli_get_client_version();
313
+        return $MYSQL_CLIENT_VERSION_CACHE[$cacheKey] = (string)\mysqli_get_client_version();
314 314
     }
315 315
 
316 316
     /**
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
         if ($doctrineConnection) {
339 339
             $doctrineWrappedConnection = $doctrineConnection->getWrappedConnection();
340 340
             if ($doctrineWrappedConnection instanceof \Doctrine\DBAL\Driver\PDOConnection) {
341
-                return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string) $doctrineWrappedConnection->getServerVersion();
341
+                return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string)$doctrineWrappedConnection->getServerVersion();
342 342
             }
343 343
         }
344 344
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
             return '';
348 348
         }
349 349
 
350
-        return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string) \mysqli_get_server_version($mysqli_link);
350
+        return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string)\mysqli_get_server_version($mysqli_link);
351 351
     }
352 352
 
353 353
     /**
@@ -388,13 +388,13 @@  discard block
 block discarded – undo
388 388
         }
389 389
 
390 390
         if ($databaseName) {
391
-            $databaseName = $dbConnection->quote_string(\trim($databaseName)) . '.';
391
+            $databaseName = $dbConnection->quote_string(\trim($databaseName)).'.';
392 392
         }
393 393
 
394 394
         /** @var string $table */
395 395
         $table = $dbConnection->escape($table);
396 396
 
397
-        $sql = 'SHOW COLUMNS FROM ' . $databaseName . $table;
397
+        $sql = 'SHOW COLUMNS FROM '.$databaseName.$table;
398 398
         $result = $dbConnection->query($sql);
399 399
 
400 400
         if ($result instanceof Result && $result->num_rows > 0) {
@@ -446,17 +446,17 @@  discard block
 block discarded – undo
446 446
 
447 447
         $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
448 448
         if ($whereSQL) {
449
-            $whereSQL = 'AND ' . $whereSQL;
449
+            $whereSQL = 'AND '.$whereSQL;
450 450
         }
451 451
 
452 452
         if ($databaseName) {
453
-            $databaseName = $dbConnection->quote_string(\trim($databaseName)) . '.';
453
+            $databaseName = $dbConnection->quote_string(\trim($databaseName)).'.';
454 454
         }
455 455
 
456 456
         // get the row
457
-        $query = 'SELECT * FROM ' . $databaseName . $dbConnection->quote_string($table) . '
457
+        $query = 'SELECT * FROM '.$databaseName.$dbConnection->quote_string($table).'
458 458
           WHERE 1 = 1
459
-          ' . $whereSQL . '
459
+          ' . $whereSQL.'
460 460
         ';
461 461
         $result = $dbConnection->query($query);
462 462
 
@@ -475,11 +475,11 @@  discard block
 block discarded – undo
475 475
                 foreach ($tmpArray as $fieldName => $value) {
476 476
                     if (!\in_array($fieldName, $ignoreArray, true)) {
477 477
                         if (\array_key_exists($fieldName, $updateArray)) {
478
-                            $insert_keys .= ',' . $fieldName;
478
+                            $insert_keys .= ','.$fieldName;
479 479
                             $insert_values .= ',?';
480 480
                             $bindings[] = $updateArray[$fieldName]; // INFO: do not escape non selected data
481 481
                         } else {
482
-                            $insert_keys .= ',' . $fieldName;
482
+                            $insert_keys .= ','.$fieldName;
483 483
                             $insert_values .= ',?';
484 484
                             $bindings[] = $value; // INFO: do not escape non selected data
485 485
                         }
@@ -490,10 +490,10 @@  discard block
 block discarded – undo
490 490
                 $insert_values = \ltrim($insert_values, ',');
491 491
 
492 492
                 // insert the "copied" row
493
-                $new_query = 'INSERT INTO ' . $databaseName . $dbConnection->quote_string($table) . ' 
494
-                  (' . $insert_keys . ')
493
+                $new_query = 'INSERT INTO '.$databaseName.$dbConnection->quote_string($table).' 
494
+                  (' . $insert_keys.')
495 495
                   VALUES 
496
-                  (' . $insert_values . ')
496
+                  (' . $insert_values.')
497 497
                 ';
498 498
 
499 499
                 $return = $dbConnection->query($new_query, $bindings);
Please login to merge, or discard this patch.
src/voku/db/DB.php 1 patch
Spacing   +57 added lines, -57 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';
@@ -456,30 +456,30 @@  discard block
 block discarded – undo
456 456
                 }
457 457
 
458 458
                 if ($_connector === 'NOT IN' || $_connector === 'IN') {
459
-                    $_value = '(' . \implode(',', $_value) . ')';
459
+                    $_value = '('.\implode(',', $_value).')';
460 460
                 } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
461
-                    $_value = '(' . \implode(' AND ', $_value) . ')';
461
+                    $_value = '('.\implode(' AND ', $_value).')';
462 462
                 } elseif ($firstKey && $firstValue) {
463
-                    if (\strpos((string) $firstKey, ' +') !== false) {
464
-                        $firstKey = \str_replace(' +', '', (string) $firstKey);
465
-                        $_value = $firstKey . ' + ' . $firstValue;
463
+                    if (\strpos((string)$firstKey, ' +') !== false) {
464
+                        $firstKey = \str_replace(' +', '', (string)$firstKey);
465
+                        $_value = $firstKey.' + '.$firstValue;
466 466
                     }
467 467
 
468
-                    if (\strpos((string) $firstKey, ' -') !== false) {
469
-                        $firstKey = \str_replace(' -', '', (string) $firstKey);
470
-                        $_value = $firstKey . ' - ' . $firstValue;
468
+                    if (\strpos((string)$firstKey, ' -') !== false) {
469
+                        $firstKey = \str_replace(' -', '', (string)$firstKey);
470
+                        $_value = $firstKey.' - '.$firstValue;
471 471
                     }
472 472
                 }
473 473
             } else {
474 474
                 $_value = $this->secure($_value);
475 475
             }
476 476
 
477
-            $_key = UTF8::str_replace_last($_glueHelper, '', (string) $_key);
477
+            $_key = UTF8::str_replace_last($_glueHelper, '', (string)$_key);
478 478
             $_key = UTF8::str_replace_last($_connector, '', $_key);
479 479
 
480 480
             $quoteString = $this->quote_string(\trim($_key));
481 481
 
482
-            $_value = (array) $_value;
482
+            $_value = (array)$_value;
483 483
 
484 484
             if (!$_glueHelper) {
485 485
                 $_glueHelper = $glue;
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
                     $valueInner = "''";
504 504
                 }
505 505
 
506
-                $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
506
+                $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
507 507
                 $tmpCounter++;
508 508
             }
509 509
 
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
             unset($params[$key]);
557 557
 
558 558
             $sql = \substr_replace($sql, $replacement, $offset, 1);
559
-            $offset = \strpos($sql, '?', $offset + \strlen((string) $replacement));
559
+            $offset = \strpos($sql, '?', $offset + \strlen((string)$replacement));
560 560
         }
561 561
 
562 562
         return ['sql' => $sql, 'params' => $params];
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
593 593
 
594 594
             // add ":" if needed
595 595
             if (\strpos($name, ':') !== 0) {
596
-                $nameTmp = ':' . $name;
596
+                $nameTmp = ':'.$name;
597 597
             } else {
598 598
                 $nameTmp = $name;
599 599
             }
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
             if ($offset === null) {
602 602
                 $offset = \strpos($sql, $nameTmp);
603 603
             } else {
604
-                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string) $replacement));
604
+                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string)$replacement));
605 605
             }
606 606
 
607 607
             if ($offset === false) {
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
             return \mysqli_affected_rows($this->mysqli_link);
635 635
         }
636 636
 
637
-        return (int) $this->affected_rows;
637
+        return (int)$this->affected_rows;
638 638
     }
639 639
 
640 640
     /**
@@ -851,10 +851,10 @@  discard block
 block discarded – undo
851 851
                 $this->database,
852 852
                 $this->port,
853 853
                 $this->socket,
854
-                (int) $flags
854
+                (int)$flags
855 855
             );
856 856
         } catch (\Exception $e) {
857
-            $error = 'Error connecting to mysql server: ' . $e->getMessage();
857
+            $error = 'Error connecting to mysql server: '.$e->getMessage();
858 858
             $this->debug->displayError($error, false);
859 859
 
860 860
             throw new DBConnectException($error, 100, $e);
@@ -863,7 +863,7 @@  discard block
 block discarded – undo
863 863
 
864 864
         $errno = \mysqli_connect_errno();
865 865
         if (!$this->connected || $errno) {
866
-            $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
866
+            $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
867 867
             $this->debug->displayError($error, false);
868 868
 
869 869
             throw new DBConnectException($error, 101);
@@ -886,7 +886,7 @@  discard block
 block discarded – undo
886 886
         }
887 887
 
888 888
         if (!$this->connected) {
889
-            $error = 'Error connecting to mysql server: ' . \print_r($this->doctrine_connection ? $this->doctrine_connection->errorInfo() : [], false);
889
+            $error = 'Error connecting to mysql server: '.\print_r($this->doctrine_connection ? $this->doctrine_connection->errorInfo() : [], false);
890 890
             $this->debug->displayError($error, false);
891 891
 
892 892
             throw new DBConnectException($error, 101);
@@ -933,10 +933,10 @@  discard block
 block discarded – undo
933 933
         }
934 934
 
935 935
         if ($databaseName) {
936
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
936
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
937 937
         }
938 938
 
939
-        $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE (${WHERE})";
939
+        $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE (${WHERE})";
940 940
 
941 941
         $return = $this->query($sql);
942 942
 
@@ -1041,7 +1041,7 @@  discard block
 block discarded – undo
1041 1041
                 $var = $var->format('Y-m-d H:i:s');
1042 1042
                 $type = 'string';
1043 1043
             } elseif (\method_exists($var, '__toString')) {
1044
-                $var = (string) $var;
1044
+                $var = (string)$var;
1045 1045
                 $type = 'string';
1046 1046
             }
1047 1047
         }
@@ -1052,7 +1052,7 @@  discard block
 block discarded – undo
1052 1052
                 /** @var bool $var */
1053 1053
                 $var = $var;
1054 1054
 
1055
-                $var = (int) $var;
1055
+                $var = (int)$var;
1056 1056
 
1057 1057
                 break;
1058 1058
 
@@ -1100,7 +1100,7 @@  discard block
 block discarded – undo
1100 1100
                     }
1101 1101
                 } else {
1102 1102
                     $varCleaned = [];
1103
-                    foreach ((array) $var as $key => $value) {
1103
+                    foreach ((array)$var as $key => $value) {
1104 1104
                         /** @var string $key */
1105 1105
                         $key = $this->escape($key, $stripe_non_utf8, $html_entity_decode);
1106 1106
                         /** @var string $value */
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
1170 1170
 
1171 1171
         if ($useCache) {
1172 1172
             $cache = new \voku\cache\Cache(null, null, false, $useCache);
1173
-            $cacheKey = 'sql-' . \md5($query);
1173
+            $cacheKey = 'sql-'.\md5($query);
1174 1174
 
1175 1175
             if (
1176 1176
                 $cache->getCacheIsReady()
@@ -1346,7 +1346,7 @@  discard block
 block discarded – undo
1346 1346
         }
1347 1347
 
1348 1348
         if (
1349
-            '' . $hostname . $username . $password . $database . $port . $charset === '' . $port . $charset
1349
+            ''.$hostname.$username.$password.$database.$port.$charset === ''.$port.$charset
1350 1350
             &&
1351 1351
             $firstInstance instanceof self
1352 1352
         ) {
@@ -1362,13 +1362,13 @@  discard block
 block discarded – undo
1362 1362
             if (\is_object($extra_config_value)) {
1363 1363
                 $extra_config_value_tmp = \spl_object_hash($extra_config_value);
1364 1364
             } else {
1365
-                $extra_config_value_tmp = (string) $extra_config_value;
1365
+                $extra_config_value_tmp = (string)$extra_config_value;
1366 1366
             }
1367
-            $extra_config_string .= $extra_config_key . $extra_config_value_tmp;
1367
+            $extra_config_string .= $extra_config_key.$extra_config_value_tmp;
1368 1368
         }
1369 1369
 
1370 1370
         $connection = \md5(
1371
-            $hostname . $username . $password . $database . $port . $charset . (int) $exit_on_error . (int) $echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1371
+            $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1372 1372
         );
1373 1373
 
1374 1374
         if (!isset($instance[$connection])) {
@@ -1511,10 +1511,10 @@  discard block
 block discarded – undo
1511 1511
         $SET = $this->_parseArrayPair($data);
1512 1512
 
1513 1513
         if ($databaseName) {
1514
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1514
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
1515 1515
         }
1516 1516
 
1517
-        $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET ${SET}";
1517
+        $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET ${SET}";
1518 1518
 
1519 1519
         $return = $this->query($sql);
1520 1520
         if ($return === false) {
@@ -1688,7 +1688,7 @@  discard block
 block discarded – undo
1688 1688
                         $errorCode = 1;
1689 1689
                     }
1690 1690
 
1691
-                    return $this->queryErrorHandling($queryException->getMessage(), (int) $errorCode, $sql, false, true);
1691
+                    return $this->queryErrorHandling($queryException->getMessage(), (int)$errorCode, $sql, false, true);
1692 1692
                 }
1693 1693
             }
1694 1694
         } elseif ($this->mysqli_link) {
@@ -2038,7 +2038,7 @@  discard block
 block discarded – undo
2038 2038
                 $errorCode = 1;
2039 2039
             }
2040 2040
 
2041
-            return $this->queryErrorHandling($queryException->getMessage(), (int) $errorCode, $sql, $params);
2041
+            return $this->queryErrorHandling($queryException->getMessage(), (int)$errorCode, $sql, $params);
2042 2042
         }
2043 2043
 
2044 2044
         if ($this->mysqli_link) {
@@ -2127,12 +2127,12 @@  discard block
 block discarded – undo
2127 2127
 
2128 2128
             // exit if we have more then 3 "DB server has gone away"-errors
2129 2129
             if ($RECONNECT_COUNTER > 3) {
2130
-                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
2130
+                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
2131 2131
 
2132 2132
                 throw new DBGoneAwayException($errorMessage);
2133 2133
             }
2134 2134
 
2135
-            $this->debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
2135
+            $this->debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
2136 2136
 
2137 2137
             // reconnect
2138 2138
             $RECONNECT_COUNTER++;
@@ -2146,7 +2146,7 @@  discard block
 block discarded – undo
2146 2146
             return false;
2147 2147
         }
2148 2148
 
2149
-        $this->debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
2149
+        $this->debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
2150 2150
 
2151 2151
         if (
2152 2152
             $force_exception_after_error === null
@@ -2157,7 +2157,7 @@  discard block
 block discarded – undo
2157 2157
         }
2158 2158
 
2159 2159
         // this query returned an error, we must display it (only for dev) !!!
2160
-        $this->debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
2160
+        $this->debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
2161 2161
 
2162 2162
         return false;
2163 2163
     }
@@ -2178,12 +2178,12 @@  discard block
 block discarded – undo
2178 2178
             '`',
2179 2179
             '``',
2180 2180
             \trim(
2181
-                (string) $str,
2181
+                (string)$str,
2182 2182
                 '`'
2183 2183
             )
2184 2184
         );
2185 2185
 
2186
-        return '`' . $str . '`';
2186
+        return '`'.$str.'`';
2187 2187
     }
2188 2188
 
2189 2189
     /**
@@ -2252,10 +2252,10 @@  discard block
 block discarded – undo
2252 2252
         $values = \implode(',', $data);
2253 2253
 
2254 2254
         if ($databaseName) {
2255
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2255
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2256 2256
         }
2257 2257
 
2258
-        $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " (${columns}) VALUES (${values})";
2258
+        $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." (${columns}) VALUES (${values})";
2259 2259
 
2260 2260
         $return = $this->query($sql);
2261 2261
         \assert(\is_int($return) || $return === false);
@@ -2354,7 +2354,7 @@  discard block
 block discarded – undo
2354 2354
                 }
2355 2355
             } else {
2356 2356
                 $varCleaned = [];
2357
-                foreach ((array) $var as $key => $value) {
2357
+                foreach ((array)$var as $key => $value) {
2358 2358
                     /** @var string $key */
2359 2359
                     $key = $this->escape($key, false, false, $convert_array);
2360 2360
                     /** @var float|int|string $value */
@@ -2402,7 +2402,7 @@  discard block
 block discarded – undo
2402 2402
         $var = $this->escape($var, false, false, null);
2403 2403
 
2404 2404
         if (\is_string($var)) {
2405
-            $var = "'" . \trim($var, "'") . "'";
2405
+            $var = "'".\trim($var, "'")."'";
2406 2406
         }
2407 2407
 
2408 2408
         return $var;
@@ -2444,10 +2444,10 @@  discard block
 block discarded – undo
2444 2444
         }
2445 2445
 
2446 2446
         if ($databaseName) {
2447
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2447
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2448 2448
         }
2449 2449
 
2450
-        $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE (${WHERE})";
2450
+        $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE (${WHERE})";
2451 2451
 
2452 2452
         $return = $this->query($sql);
2453 2453
         \assert($return instanceof Result || $return === false);
@@ -2500,7 +2500,7 @@  discard block
 block discarded – undo
2500 2500
     public function setConfigExtra(array $extra_config)
2501 2501
     {
2502 2502
         if (isset($extra_config['session_to_db'])) {
2503
-            $this->session_to_db = (bool) $extra_config['session_to_db'];
2503
+            $this->session_to_db = (bool)$extra_config['session_to_db'];
2504 2504
         }
2505 2505
 
2506 2506
         if (isset($extra_config['doctrine'])) {
@@ -2563,9 +2563,9 @@  discard block
 block discarded – undo
2563 2563
             $return = \mysqli_set_charset($this->mysqli_link, $charset);
2564 2564
 
2565 2565
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2566
-            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET ' . $charset);
2566
+            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET '.$charset);
2567 2567
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2568
-            @\mysqli_query($this->mysqli_link, "SET NAMES '" . $charset . "'");
2568
+            @\mysqli_query($this->mysqli_link, "SET NAMES '".$charset."'");
2569 2569
         } elseif ($this->doctrine_connection && $this->isDoctrinePDOConnection()) {
2570 2570
             $doctrineWrappedConnection = $this->getDoctrinePDOConnection();
2571 2571
             if (!$doctrineWrappedConnection instanceof \Doctrine\DBAL\Connection) {
@@ -2573,9 +2573,9 @@  discard block
 block discarded – undo
2573 2573
             }
2574 2574
 
2575 2575
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2576
-            @$doctrineWrappedConnection->exec('SET CHARACTER SET ' . $charset);
2576
+            @$doctrineWrappedConnection->exec('SET CHARACTER SET '.$charset);
2577 2577
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2578
-            @$doctrineWrappedConnection->exec("SET NAMES '" . $charset . "'");
2578
+            @$doctrineWrappedConnection->exec("SET NAMES '".$charset."'");
2579 2579
 
2580 2580
             $return = true;
2581 2581
         } else {
@@ -2716,7 +2716,7 @@  discard block
 block discarded – undo
2716 2716
      */
2717 2717
     public function table_exists(string $table): bool
2718 2718
     {
2719
-        $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
2719
+        $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
2720 2720
 
2721 2721
         return $check !== false
2722 2722
                &&
@@ -2747,7 +2747,7 @@  discard block
 block discarded – undo
2747 2747
             $result = $callback($this);
2748 2748
             if ($result === false) {
2749 2749
                 /** @noinspection ThrowRawExceptionInspection */
2750
-                throw new \Exception('call_user_func [' . \print_r($callback, true) . '] === false');
2750
+                throw new \Exception('call_user_func ['.\print_r($callback, true).'] === false');
2751 2751
             }
2752 2752
 
2753 2753
             return $this->commit();
@@ -2810,10 +2810,10 @@  discard block
 block discarded – undo
2810 2810
         }
2811 2811
 
2812 2812
         if ($databaseName) {
2813
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2813
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2814 2814
         }
2815 2815
 
2816
-        $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET ${SET} WHERE (${WHERE})";
2816
+        $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET ${SET} WHERE (${WHERE})";
2817 2817
 
2818 2818
         $return = $this->query($sql);
2819 2819
         \assert(\is_int($return) || $return === false);
Please login to merge, or discard this patch.
src/voku/db/Result.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -144,14 +144,14 @@  discard block
 block discarded – undo
144 144
             &&
145 145
             !$result instanceof \Doctrine\DBAL\Driver\Statement
146 146
         ) {
147
-            throw new \InvalidArgumentException('$result must be ' . \mysqli_result::class . ' or ' . \Doctrine\DBAL\Driver\Statement::class . ' !');
147
+            throw new \InvalidArgumentException('$result must be '.\mysqli_result::class.' or '.\Doctrine\DBAL\Driver\Statement::class.' !');
148 148
         }
149 149
 
150 150
         $this->_result = $result;
151 151
 
152 152
         if ($this->_result instanceof \Doctrine\DBAL\Driver\Statement) {
153 153
             if (\method_exists($this->_result, 'getWrappedStatement')) {
154
-                throw new \InvalidArgumentException('$result (' . \Doctrine\DBAL\Driver\Statement::class . ') must implement "getWrappedStatement()"!');
154
+                throw new \InvalidArgumentException('$result ('.\Doctrine\DBAL\Driver\Statement::class.') must implement "getWrappedStatement()"!');
155 155
             }
156 156
 
157 157
             $doctrineDriver = $this->_result->getWrappedStatement();
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 
171 171
             $this->num_rows = $this->_result->rowCount();
172 172
         } else {
173
-            $this->num_rows = (int) $this->_result->num_rows;
173
+            $this->num_rows = (int)$this->_result->num_rows;
174 174
         }
175 175
 
176 176
         $this->current_row = 0;
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
      */
212 212
     public function __toString()
213 213
     {
214
-        return (string) $this->num_rows;
214
+        return (string)$this->num_rows;
215 215
     }
216 216
 
217 217
     /**
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
         }
528 528
 
529 529
         return \Arrayy\Arrayy::createFromGeneratorFunction(
530
-            function () {
530
+            function() {
531 531
                 $this->reset();
532 532
 
533 533
                 /** @noinspection PhpAssignmentInConditionInspection */
@@ -877,8 +877,8 @@  discard block
 block discarded – undo
877 877
 
878 878
         if ($as_array) {
879 879
             $fields = \array_map(
880
-                static function ($object) {
881
-                    return (array) $object;
880
+                static function($object) {
881
+                    return (array)$object;
882 882
                 },
883 883
                 $fields
884 884
             );
@@ -1062,7 +1062,7 @@  discard block
 block discarded – undo
1062 1062
         }
1063 1063
 
1064 1064
         return \array_map(
1065
-            static function ($values) use ($keys) {
1065
+            static function($values) use ($keys) {
1066 1066
                 return \array_combine($keys, $values);
1067 1067
             },
1068 1068
             $rows
@@ -1216,7 +1216,7 @@  discard block
 block discarded – undo
1216 1216
                     $fieldTmp->{$metadataTmpKey} = $metadataTmpValue;
1217 1217
                 }
1218 1218
 
1219
-                $typeNativeTmp = 'MYSQL_TYPE_' . ($metadataTmp['native_type'] ?? '');
1219
+                $typeNativeTmp = 'MYSQL_TYPE_'.($metadataTmp['native_type'] ?? '');
1220 1220
                 $typeTmp = $THIS_CLASS_TMP->getConstant($typeNativeTmp);
1221 1221
                 if ($typeTmp) {
1222 1222
                     $fieldTmp->type = $typeTmp;
@@ -1578,11 +1578,11 @@  discard block
 block discarded – undo
1578 1578
             if (\abs($offset) > $this->num_rows) {
1579 1579
                 $offset = 0;
1580 1580
             } else {
1581
-                $offset = $this->num_rows - (int) \abs($offset);
1581
+                $offset = $this->num_rows - (int)\abs($offset);
1582 1582
             }
1583 1583
         }
1584 1584
 
1585
-        $length = $length !== null ? (int) $length : $this->num_rows;
1585
+        $length = $length !== null ? (int)$length : $this->num_rows;
1586 1586
         $n = 0;
1587 1587
         for ($i = $offset; $i < $this->num_rows && $n < $length; $i++) {
1588 1588
             if ($preserve_keys) {
Please login to merge, or discard this patch.