@@ -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 | { |
@@ -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 @@ 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)) |
@@ -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 | { |
@@ -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])) |
@@ -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 | } |
@@ -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); |
@@ -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 | |
@@ -525,9 +525,9 @@ |
||
| 525 | 525 | private function extractParameters() |
| 526 | 526 | { |
| 527 | 527 | $this->routineParameters = new RoutineParametersHelper($this->dl, |
| 528 | - $this->io, |
|
| 529 | - $this->docBlockReflection, |
|
| 530 | - $this->routineName); |
|
| 528 | + $this->io, |
|
| 529 | + $this->docBlockReflection, |
|
| 530 | + $this->routineName); |
|
| 531 | 531 | |
| 532 | 532 | $this->routineParameters->extractRoutineParameters(); |
| 533 | 533 | } |