@@ -1000,7 +1000,7 @@ |
||
| 1000 | 1000 | if (!$success) throw $this->queryError('mysqli::real_query', $query); |
| 1001 | 1001 | |
| 1002 | 1002 | $this->queryLog[] = ['query' => $query, |
| 1003 | - 'time' => microtime(true) - $time0]; |
|
| 1003 | + 'time' => microtime(true) - $time0]; |
|
| 1004 | 1004 | } |
| 1005 | 1005 | else |
| 1006 | 1006 | { |
@@ -302,8 +302,8 @@ discard block |
||
| 302 | 302 | $line = ''; |
| 303 | 303 | foreach ($row as $i => $field) |
| 304 | 304 | { |
| 305 | - if ($i>0) $line .= ' '; |
|
| 306 | - $line .= str_pad((string)$field, $fields[$i]->max_length); |
|
| 305 | + if ($i > 0) $line .= ' '; |
|
| 306 | + $line .= str_pad((string) $field, $fields[$i]->max_length); |
|
| 307 | 307 | } |
| 308 | 308 | echo date('Y-m-d H:i:s'), ' ', $line, "\n"; |
| 309 | 309 | $n++; |
@@ -640,10 +640,10 @@ discard block |
||
| 640 | 640 | // with size $maxAllowedPacket bytes (but only $maxAllowedPacket - 8 bytes). But when setting the size of |
| 641 | 641 | // $chunkSize less than $maxAllowedPacket than it is possible to transmit a LOB with size |
| 642 | 642 | // $maxAllowedPacket bytes. |
| 643 | - $this->chunkSize = (int)min($this->maxAllowedPacket - 8, 1024 * 1024); |
|
| 643 | + $this->chunkSize = (int) min($this->maxAllowedPacket - 8, 1024 * 1024); |
|
| 644 | 644 | } |
| 645 | 645 | |
| 646 | - return (int)$this->maxAllowedPacket; |
|
| 646 | + return (int) $this->maxAllowedPacket; |
|
| 647 | 647 | } |
| 648 | 648 | |
| 649 | 649 | //-------------------------------------------------------------------------------------------------------------------- |
@@ -723,7 +723,7 @@ discard block |
||
| 723 | 723 | { |
| 724 | 724 | if ($value===null || $value==='') return 'null'; |
| 725 | 725 | |
| 726 | - if (is_int($value) || is_float($value)) return (string)$value; |
|
| 726 | + if (is_int($value) || is_float($value)) return (string) $value; |
|
| 727 | 727 | |
| 728 | 728 | return "'".$this->mysqli->real_escape_string($value)."'"; |
| 729 | 729 | } |
@@ -740,7 +740,7 @@ discard block |
||
| 740 | 740 | { |
| 741 | 741 | if ($value===null) return 'null'; |
| 742 | 742 | |
| 743 | - return (string)$value; |
|
| 743 | + return (string) $value; |
|
| 744 | 744 | } |
| 745 | 745 | |
| 746 | 746 | //-------------------------------------------------------------------------------------------------------------------- |
@@ -755,7 +755,7 @@ discard block |
||
| 755 | 755 | { |
| 756 | 756 | if ($value===null) return 'null'; |
| 757 | 757 | |
| 758 | - return (string)$value; |
|
| 758 | + return (string) $value; |
|
| 759 | 759 | } |
| 760 | 760 | |
| 761 | 761 | //-------------------------------------------------------------------------------------------------------------------- |
@@ -1027,7 +1027,7 @@ discard block |
||
| 1027 | 1027 | { |
| 1028 | 1028 | $n = strlen($data); |
| 1029 | 1029 | $p = 0; |
| 1030 | - while ($p<$n) |
|
| 1030 | + while ($p < $n) |
|
| 1031 | 1031 | { |
| 1032 | 1032 | $success = @$statement->send_long_data($paramNr, substr($data, $p, $this->chunkSize)); |
| 1033 | 1033 | if (!$success) throw $this->dataLayerError('mysqli_stmt::send_long_data'); |
@@ -1067,13 +1067,13 @@ discard block |
||
| 1067 | 1067 | foreach ($columns as $column) |
| 1068 | 1068 | { |
| 1069 | 1069 | $separator .= str_repeat('-', $column['length'] + 2).'+'; |
| 1070 | - $spaces = ($column['length'] + 2) - mb_strlen((string)$column['header']); |
|
| 1070 | + $spaces = ($column['length'] + 2) - mb_strlen((string) $column['header']); |
|
| 1071 | 1071 | |
| 1072 | - $spacesLeft = (int)floor($spaces / 2); |
|
| 1073 | - $spacesRight = (int)ceil($spaces / 2); |
|
| 1072 | + $spacesLeft = (int) floor($spaces / 2); |
|
| 1073 | + $spacesRight = (int) ceil($spaces / 2); |
|
| 1074 | 1074 | |
| 1075 | - $fillerLeft = ($spacesLeft>0) ? str_repeat(' ', $spacesLeft) : ''; |
|
| 1076 | - $fillerRight = ($spacesRight>0) ? str_repeat(' ', $spacesRight) : ''; |
|
| 1075 | + $fillerLeft = ($spacesLeft > 0) ? str_repeat(' ', $spacesLeft) : ''; |
|
| 1076 | + $fillerRight = ($spacesRight > 0) ? str_repeat(' ', $spacesRight) : ''; |
|
| 1077 | 1077 | |
| 1078 | 1078 | $header .= $fillerLeft.$column['header'].$fillerRight.'|'; |
| 1079 | 1079 | } |
@@ -1092,7 +1092,7 @@ discard block |
||
| 1092 | 1092 | */ |
| 1093 | 1093 | private function executeTableShowTableColumn(array $column, $value): void |
| 1094 | 1094 | { |
| 1095 | - $spaces = str_repeat(' ', $column['length'] - mb_strlen((string)$value)); |
|
| 1095 | + $spaces = str_repeat(' ', $column['length'] - mb_strlen((string) $value)); |
|
| 1096 | 1096 | |
| 1097 | 1097 | switch ($column['type']) |
| 1098 | 1098 | { |
@@ -46,14 +46,14 @@ |
||
| 46 | 46 | if ($this->routine['return']=='bool') |
| 47 | 47 | { |
| 48 | 48 | $this->codeStore->append(sprintf("return !empty(\$this->executeSingleton0('select %s(%s)'));", |
| 49 | - $this->routine['routine_name'], |
|
| 50 | - $this->getRoutineArgs())); |
|
| 49 | + $this->routine['routine_name'], |
|
| 50 | + $this->getRoutineArgs())); |
|
| 51 | 51 | } |
| 52 | 52 | else |
| 53 | 53 | { |
| 54 | 54 | $this->codeStore->append(sprintf("return \$this->executeSingleton0('select %s(%s)');", |
| 55 | - $this->routine['routine_name'], |
|
| 56 | - $this->getRoutineArgs())); |
|
| 55 | + $this->routine['routine_name'], |
|
| 56 | + $this->getRoutineArgs())); |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | |
@@ -264,7 +264,7 @@ |
||
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | - if ($blobArgumentIndex>0) |
|
| 267 | + if ($blobArgumentIndex > 0) |
|
| 268 | 268 | { |
| 269 | 269 | $this->codeStore->append(''); |
| 270 | 270 | } |
@@ -483,9 +483,9 @@ |
||
| 483 | 483 | $mangledName = $this->nameMangler->getParameterName($parameter['parameter_name']); |
| 484 | 484 | |
| 485 | 485 | $parameters[] = ['php_name' => '$'.$mangledName, |
| 486 | - 'description' => $parameter['description'], |
|
| 487 | - 'php_type' => $parameter['php_type'], |
|
| 488 | - 'dtd_identifier' => $parameter['dtd_identifier']]; |
|
| 486 | + 'description' => $parameter['description'], |
|
| 487 | + 'php_type' => $parameter['php_type'], |
|
| 488 | + 'dtd_identifier' => $parameter['dtd_identifier']]; |
|
| 489 | 489 | } |
| 490 | 490 | |
| 491 | 491 | $this->enhancePhpDocBlockParameters($parameters); |
@@ -97,7 +97,7 @@ |
||
| 97 | 97 | |
| 98 | 98 | case 'decimal': |
| 99 | 99 | $ret = $dataTypeInfo['numeric_precision']; |
| 100 | - if ($dataTypeInfo['numeric_scale']>0) $ret += 1; |
|
| 100 | + if ($dataTypeInfo['numeric_scale'] > 0) $ret += 1; |
|
| 101 | 101 | break; |
| 102 | 102 | |
| 103 | 103 | case 'char': |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | $this->tableName, |
| 265 | 265 | $column['column_name'], |
| 266 | 266 | '%type')), |
| 267 | - false); |
|
| 267 | + false); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | if ($column!=end($this->tableColumns)) |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | $this->tableName, |
| 315 | 315 | $column['column_name'], |
| 316 | 316 | '%type')), |
| 317 | - false); |
|
| 317 | + false); |
|
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | if ($column!=end($columns)) |
@@ -207,7 +207,7 @@ |
||
| 207 | 207 | $keys = $this->keyList(); |
| 208 | 208 | if (!empty($keys)) |
| 209 | 209 | { |
| 210 | - if (sizeof($keys)>1 || !isset($keys['PRIMARY'])) |
|
| 210 | + if (sizeof($keys) > 1 || !isset($keys['PRIMARY'])) |
|
| 211 | 211 | { |
| 212 | 212 | $this->codeStore->append(' * ', false); |
| 213 | 213 | $this->codeStore->append(' * Possible keys:', false); |
@@ -400,7 +400,7 @@ |
||
| 400 | 400 | { |
| 401 | 401 | $sql = 'select @@sql_mode'; |
| 402 | 402 | |
| 403 | - return (string)$this->executeSingleton1($sql); |
|
| 403 | + return (string) $this->executeSingleton1($sql); |
|
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | //-------------------------------------------------------------------------------------------------------------------- |
@@ -543,9 +543,9 @@ discard block |
||
| 543 | 543 | where TABLE_SCHEMA = ifnull(%s, database()) |
| 544 | 544 | and TABLE_NAME = %s |
| 545 | 545 | and COLUMN_NAME = %s', |
| 546 | - $this->dl->quoteString($schemaName), |
|
| 547 | - $this->dl->quoteString($tableName), |
|
| 548 | - $this->dl->quoteString($columnName)); |
|
| 546 | + $this->dl->quoteString($schemaName), |
|
| 547 | + $this->dl->quoteString($tableName), |
|
| 548 | + $this->dl->quoteString($columnName)); |
|
| 549 | 549 | |
| 550 | 550 | return $this->executeRow1($sql); |
| 551 | 551 | } |
@@ -574,8 +574,8 @@ discard block |
||
| 574 | 574 | where TABLE_SCHEMA = %s |
| 575 | 575 | and TABLE_NAME = %s |
| 576 | 576 | order by ORDINAL_POSITION', |
| 577 | - $this->dl->quoteString($schemaName), |
|
| 578 | - $this->dl->quoteString($tableName)); |
|
| 577 | + $this->dl->quoteString($schemaName), |
|
| 578 | + $this->dl->quoteString($tableName)); |
|
| 579 | 579 | |
| 580 | 580 | return $this->executeRows($sql); |
| 581 | 581 | } |
@@ -596,8 +596,8 @@ discard block |
||
| 596 | 596 | $sql = sprintf(' |
| 597 | 597 | show index from `%s`.`%s` |
| 598 | 598 | where Key_name = \'PRIMARY\'', |
| 599 | - $schemaName, |
|
| 600 | - $tableName); |
|
| 599 | + $schemaName, |
|
| 600 | + $tableName); |
|
| 601 | 601 | |
| 602 | 602 | return $this->executeRows($sql); |
| 603 | 603 | } |
@@ -618,8 +618,8 @@ discard block |
||
| 618 | 618 | $sql = sprintf(' |
| 619 | 619 | show index from `%s`.`%s` |
| 620 | 620 | where Non_unique = 0', |
| 621 | - $schemaName, |
|
| 622 | - $tableName); |
|
| 621 | + $schemaName, |
|
| 622 | + $tableName); |
|
| 623 | 623 | |
| 624 | 624 | return $this->executeRows($sql); |
| 625 | 625 | } |
@@ -401,7 +401,8 @@ |
||
| 401 | 401 | { |
| 402 | 402 | $this->io->writeln(''); |
| 403 | 403 | |
| 404 | - usort($this->sources, function ($a, $b) { |
|
| 404 | + usort($this->sources, function ($a, $b) |
|
| 405 | + { |
|
| 405 | 406 | return strcmp($a['routine_name'], $b['routine_name']); |
| 406 | 407 | }); |
| 407 | 408 | |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | $this->io->error(sprintf("The following source files would result wrapper methods with equal name '%s'", |
| 192 | - $method)); |
|
| 192 | + $method)); |
|
| 193 | 193 | $this->io->listing($tmp); |
| 194 | 194 | } |
| 195 | 195 | |
@@ -225,8 +225,8 @@ discard block |
||
| 225 | 225 | if (!isset($lookup[$oldRoutine['routine_name']])) |
| 226 | 226 | { |
| 227 | 227 | $this->io->logInfo('Dropping %s <dbo>%s</dbo>', |
| 228 | - strtolower($oldRoutine['routine_type']), |
|
| 229 | - $oldRoutine['routine_name']); |
|
| 228 | + strtolower($oldRoutine['routine_type']), |
|
| 229 | + $oldRoutine['routine_name']); |
|
| 230 | 230 | |
| 231 | 231 | $this->dl->dropRoutine($oldRoutine['routine_type'], $oldRoutine['routine_name']); |
| 232 | 232 | } |
@@ -585,9 +585,9 @@ discard block |
||
| 585 | 585 | if ($max!==null) |
| 586 | 586 | { |
| 587 | 587 | $value = sprintf('%s(%d) character set %s', |
| 588 | - $column['data_type'], |
|
| 589 | - $max, |
|
| 590 | - $column['character_set_name']); |
|
| 588 | + $column['data_type'], |
|
| 589 | + $max, |
|
| 590 | + $column['character_set_name']); |
|
| 591 | 591 | } |
| 592 | 592 | else |
| 593 | 593 | { |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | $duplicatesMethods = []; |
| 305 | 305 | foreach ($this->sources as $source) |
| 306 | 306 | { |
| 307 | - if (sizeof($lookup[$source['method_name']])>1) |
|
| 307 | + if (sizeof($lookup[$source['method_name']]) > 1) |
|
| 308 | 308 | { |
| 309 | 309 | $duplicatesSources[$source['path_name']] = $source; |
| 310 | 310 | $duplicatesMethods[$source['method_name']] = $lookup[$source['method_name']]; |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | { |
| 394 | 394 | $this->io->writeln(''); |
| 395 | 395 | |
| 396 | - usort($this->sources, function ($a, $b) { |
|
| 396 | + usort($this->sources, function($a, $b) { |
|
| 397 | 397 | return strcmp($a['routine_name'], $b['routine_name']); |
| 398 | 398 | }); |
| 399 | 399 | |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | |
| 474 | 474 | $size = $this->characterSets[$key]['maxlen']; |
| 475 | 475 | |
| 476 | - return (int)floor(self::MAX_COLUMN_SIZE / $size); |
|
| 476 | + return (int) floor(self::MAX_COLUMN_SIZE / $size); |
|
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | //-------------------------------------------------------------------------------------------------------------------- |
@@ -364,8 +364,8 @@ |
||
| 364 | 364 | if ($n==0) |
| 365 | 365 | { |
| 366 | 366 | throw new RuntimeException("Illegal format at line %d in file '%s'.", |
| 367 | - $lineNumber, |
|
| 368 | - $this->constantsFilename); |
|
| 367 | + $lineNumber, |
|
| 368 | + $this->constantsFilename); |
|
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | if (isset($matches[6])) |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | if ($token[0]==T_WHITESPACE) |
| 222 | 222 | { |
| 223 | 223 | $line2 = $token[2]; |
| 224 | - if (substr_count($token[1], "\n")>1) |
|
| 224 | + if (substr_count($token[1], "\n") > 1) |
|
| 225 | 225 | { |
| 226 | 226 | // Whitespace contains new line: end doc block without constants. |
| 227 | 227 | $step = 4; |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | { |
| 249 | 249 | if ($token[0]==T_WHITESPACE) |
| 250 | 250 | { |
| 251 | - if (substr_count($token[1], "\n")<=1) |
|
| 251 | + if (substr_count($token[1], "\n") <= 1) |
|
| 252 | 252 | { |
| 253 | 253 | // Ignore whitespace. |
| 254 | 254 | $line3 = $token[2]; |
@@ -430,7 +430,7 @@ discard block |
||
| 430 | 430 | foreach ($this->constants as $constant => $value) |
| 431 | 431 | { |
| 432 | 432 | $width1 = max(mb_strlen($constant), $width1); |
| 433 | - $width2 = max(mb_strlen((string)$value), $width2); |
|
| 433 | + $width2 = max(mb_strlen((string) $value), $width2); |
|
| 434 | 434 | } |
| 435 | 435 | |
| 436 | 436 | $format = sprintf(' const %%-%ds = %%%dd;', $width1, $width2); |
@@ -477,7 +477,7 @@ discard block |
||
| 477 | 477 | foreach ($table as $column) |
| 478 | 478 | { |
| 479 | 479 | $width1 = max(mb_strlen($column['column_name']), $width1); |
| 480 | - $width2 = max(mb_strlen((string)$column['length']), $width2); |
|
| 480 | + $width2 = max(mb_strlen((string) $column['length']), $width2); |
|
| 481 | 481 | } |
| 482 | 482 | |
| 483 | 483 | foreach ($table as $column) |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | { |
| 487 | 487 | if (isset($column['constant_name'])) |
| 488 | 488 | { |
| 489 | - $format = sprintf("%%s.%%-%ds %%%dd %%s\n", $width1, $width2); |
|
| 489 | + $format = sprintf("%%s.%%-%ds %%%dd %%s\n", $width1, $width2); |
|
| 490 | 490 | $content .= sprintf($format, |
| 491 | 491 | $column['table_name'], |
| 492 | 492 | $column['column_name'], |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | } |
| 496 | 496 | else |
| 497 | 497 | { |
| 498 | - $format = sprintf("%%s.%%-%ds %%%dd\n", $width1, $width2); |
|
| 498 | + $format = sprintf("%%s.%%-%ds %%%dd\n", $width1, $width2); |
|
| 499 | 499 | $content .= sprintf($format, |
| 500 | 500 | $column['table_name'], |
| 501 | 501 | $column['column_name'], |
@@ -95,9 +95,9 @@ discard block |
||
| 95 | 95 | foreach ($this->parameters as $parameter) |
| 96 | 96 | { |
| 97 | 97 | $parameters[] = ['parameter_name' => $parameter['parameter_name'], |
| 98 | - 'php_type' => DataTypeHelper::columnTypeToPhpTypeHinting($parameter).'|null', |
|
| 99 | - 'dtd_identifier' => $parameter['dtd_identifier'], |
|
| 100 | - 'description' => $lookup[($parameter['parameter_name'])] ?? []]; |
|
| 98 | + 'php_type' => DataTypeHelper::columnTypeToPhpTypeHinting($parameter).'|null', |
|
| 99 | + 'dtd_identifier' => $parameter['dtd_identifier'], |
|
| 100 | + 'description' => $lookup[($parameter['parameter_name'])] ?? []]; |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | return $parameters; |
@@ -201,8 +201,8 @@ discard block |
||
| 201 | 201 | if ($n!==1) |
| 202 | 202 | { |
| 203 | 203 | throw new RoutineLoaderException('Unable to parse data type description %s of parameter %s.', |
| 204 | - $parameter['dtd_identifier'], |
|
| 205 | - $parameter['parameter_name']); |
|
| 204 | + $parameter['dtd_identifier'], |
|
| 205 | + $parameter['parameter_name']); |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | $schemaName = $matches['schema'] ?? null; |
@@ -249,10 +249,10 @@ discard block |
||
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | $this->parametersAddendum[$parameterName] = ['name' => $parameterName, |
| 252 | - 'data_type' => $dataType, |
|
| 253 | - 'delimiter' => $delimiter, |
|
| 254 | - 'enclosure' => $enclosure, |
|
| 255 | - 'escape' => $escape]; |
|
| 252 | + 'data_type' => $dataType, |
|
| 253 | + 'delimiter' => $delimiter, |
|
| 254 | + 'enclosure' => $enclosure, |
|
| 255 | + 'escape' => $escape]; |
|
| 256 | 256 | } |
| 257 | 257 | } |
| 258 | 258 | |