@@ -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 | { |
@@ -545,8 +545,8 @@ discard block |
||
| 545 | 545 | where TABLE_SCHEMA = %s |
| 546 | 546 | and TABLE_NAME = %s |
| 547 | 547 | order by ORDINAL_POSITION', |
| 548 | - $this->dl->quoteString($schemaName), |
|
| 549 | - $this->dl->quoteString($tableName)); |
|
| 548 | + $this->dl->quoteString($schemaName), |
|
| 549 | + $this->dl->quoteString($tableName)); |
|
| 550 | 550 | |
| 551 | 551 | return $this->executeRows($sql); |
| 552 | 552 | } |
@@ -567,8 +567,8 @@ discard block |
||
| 567 | 567 | $sql = sprintf(' |
| 568 | 568 | show index from `%s`.`%s` |
| 569 | 569 | where Key_name = \'PRIMARY\'', |
| 570 | - $schemaName, |
|
| 571 | - $tableName); |
|
| 570 | + $schemaName, |
|
| 571 | + $tableName); |
|
| 572 | 572 | |
| 573 | 573 | return $this->executeRows($sql); |
| 574 | 574 | } |
@@ -589,8 +589,8 @@ discard block |
||
| 589 | 589 | $sql = sprintf(' |
| 590 | 590 | show index from `%s`.`%s` |
| 591 | 591 | where Non_unique = 0', |
| 592 | - $schemaName, |
|
| 593 | - $tableName); |
|
| 592 | + $schemaName, |
|
| 593 | + $tableName); |
|
| 594 | 594 | |
| 595 | 595 | return $this->executeRows($sql); |
| 596 | 596 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | $this->io->error(sprintf("The following source files would result wrapper methods with equal name '%s'", |
| 194 | - $method)); |
|
| 194 | + $method)); |
|
| 195 | 195 | $this->io->listing($tmp); |
| 196 | 196 | } |
| 197 | 197 | |
@@ -227,8 +227,8 @@ discard block |
||
| 227 | 227 | if (!isset($lookup[$old_routine['routine_name']])) |
| 228 | 228 | { |
| 229 | 229 | $this->io->logInfo('Dropping %s <dbo>%s</dbo>', |
| 230 | - strtolower($old_routine['routine_type']), |
|
| 231 | - $old_routine['routine_name']); |
|
| 230 | + strtolower($old_routine['routine_type']), |
|
| 231 | + $old_routine['routine_name']); |
|
| 232 | 232 | |
| 233 | 233 | $this->dl->dropRoutine($old_routine['routine_type'], $old_routine['routine_name']); |
| 234 | 234 | } |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | catch (RoutineLoaderException $e) |
| 439 | 439 | { |
| 440 | 440 | $messages = [$e->getMessage(), |
| 441 | - sprintf("Failed to load file '%s'", $filename['path_name'])]; |
|
| 441 | + sprintf("Failed to load file '%s'", $filename['path_name'])]; |
|
| 442 | 442 | $this->io->error($messages); |
| 443 | 443 | |
| 444 | 444 | $this->errorFilenames[] = $filename['path_name']; |
@@ -619,9 +619,9 @@ discard block |
||
| 619 | 619 | if ($max!==null) |
| 620 | 620 | { |
| 621 | 621 | $value = sprintf('%s(%d) character set %s', |
| 622 | - $column['data_type'], |
|
| 623 | - $max, |
|
| 624 | - $column['character_set_name']); |
|
| 622 | + $column['data_type'], |
|
| 623 | + $max, |
|
| 624 | + $column['character_set_name']); |
|
| 625 | 625 | } |
| 626 | 626 | else |
| 627 | 627 | { |
@@ -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 | - $line_number, |
|
| 368 | - $this->constantsFilename); |
|
| 367 | + $line_number, |
|
| 368 | + $this->constantsFilename); |
|
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | if (isset($matches[6])) |
@@ -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 | |
@@ -480,9 +480,9 @@ |
||
| 480 | 480 | $mangledName = $this->nameMangler->getParameterName($parameter['parameter_name']); |
| 481 | 481 | |
| 482 | 482 | $parameters[] = ['php_name' => '$'.$mangledName, |
| 483 | - 'description' => $parameter['description'], |
|
| 484 | - 'php_type' => $parameter['php_type'], |
|
| 485 | - 'data_type_descriptor' => $parameter['data_type_descriptor']]; |
|
| 483 | + 'description' => $parameter['description'], |
|
| 484 | + 'php_type' => $parameter['php_type'], |
|
| 485 | + 'data_type_descriptor' => $parameter['data_type_descriptor']]; |
|
| 486 | 486 | } |
| 487 | 487 | |
| 488 | 488 | $this->enhancePhpDocBlockParameters($parameters); |
@@ -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)) |
@@ -542,15 +542,15 @@ |
||
| 542 | 542 | foreach ($this->parameters as $parameter_info) |
| 543 | 543 | { |
| 544 | 544 | $parameters[] = ['parameter_name' => $parameter_info['parameter_name'], |
| 545 | - 'php_type' => DataTypeHelper::columnTypeToPhpTypeHinting($parameter_info).'|null', |
|
| 546 | - 'data_type_descriptor' => $parameter_info['data_type_descriptor'], |
|
| 547 | - 'description' => $this->getParameterDocDescription($parameter_info['parameter_name'])]; |
|
| 545 | + 'php_type' => DataTypeHelper::columnTypeToPhpTypeHinting($parameter_info).'|null', |
|
| 546 | + 'data_type_descriptor' => $parameter_info['data_type_descriptor'], |
|
| 547 | + 'description' => $this->getParameterDocDescription($parameter_info['parameter_name'])]; |
|
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | // Compose all the DocBlock parts to be used by the wrapper generator. |
| 551 | 551 | $this->docBlockPartsWrapper = ['sort_description' => $this->docBlockPartsSource['sort_description'], |
| 552 | - 'long_description' => $this->docBlockPartsSource['long_description'], |
|
| 553 | - 'parameters' => $parameters]; |
|
| 552 | + 'long_description' => $this->docBlockPartsSource['long_description'], |
|
| 553 | + 'parameters' => $parameters]; |
|
| 554 | 554 | } |
| 555 | 555 | |
| 556 | 556 | //-------------------------------------------------------------------------------------------------------------------- |