@@ -262,7 +262,7 @@ |
||
262 | 262 | */ |
263 | 263 | public function jsonSerialize() |
264 | 264 | { |
265 | - return array_map(function (AbstractTDBMObject $item) { |
|
265 | + return array_map(function(AbstractTDBMObject $item) { |
|
266 | 266 | return $item->jsonSerialize(); |
267 | 267 | }, $this->toArray()); |
268 | 268 | } |
@@ -89,11 +89,11 @@ discard block |
||
89 | 89 | |
90 | 90 | // Remove all beans and daos from junction tables |
91 | 91 | $junctionTables = $this->configuration->getSchemaAnalyzer()->detectJunctionTables(true); |
92 | - $junctionTableNames = array_map(function (Table $table) { |
|
92 | + $junctionTableNames = array_map(function(Table $table) { |
|
93 | 93 | return $table->getName(); |
94 | 94 | }, $junctionTables); |
95 | 95 | |
96 | - $tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) { |
|
96 | + $tableList = array_filter($tableList, function(Table $table) use ($junctionTableNames) { |
|
97 | 97 | return !in_array($table->getName(), $junctionTableNames, true); |
98 | 98 | }); |
99 | 99 | |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $fileContent = $this->psr2Fix($fileContent); |
175 | 175 | // Add the declare strict-types directive |
176 | 176 | $commentEnd = strpos($fileContent, ' */') + 3; |
177 | - $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1); |
|
177 | + $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1); |
|
178 | 178 | |
179 | 179 | $this->dumpFile($possibleBaseFileName, $fileContent); |
180 | 180 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | $fileContent = $this->psr2Fix($fileContent); |
237 | 237 | // Add the declare strict-types directive |
238 | 238 | $commentEnd = strpos($fileContent, ' */') + 3; |
239 | - $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1); |
|
239 | + $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1); |
|
240 | 240 | |
241 | 241 | $this->dumpFile($possibleBaseFileName, $fileContent); |
242 | 242 | |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | private function psr2Fix(string $content): string |
275 | 275 | { |
276 | 276 | // Removes the extra blank line at the end (before: `\n\n`, after: `\n`) |
277 | - return rtrim($content, PHP_EOL) . PHP_EOL; |
|
277 | + return rtrim($content, PHP_EOL).PHP_EOL; |
|
278 | 278 | } |
279 | 279 | |
280 | 280 | /** |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | $resultIteratorClassName = $beanDescriptor->getResultIteratorClassName(); |
286 | 286 | $resultIteratorBaseClassName = $beanDescriptor->getBaseResultIteratorClassName(); |
287 | 287 | $resultIteratorNamespace = $this->configuration->getResultIteratorNamespace(); |
288 | - $resultIteratorBaseNamespace = $resultIteratorNamespace . '\\Generated'; |
|
288 | + $resultIteratorBaseNamespace = $resultIteratorNamespace.'\\Generated'; |
|
289 | 289 | $beanClassWithoutNameSpace = $beanDescriptor->getBeanClassName(); |
290 | 290 | $file = $beanDescriptor->generateResultIteratorPhpCode(); |
291 | 291 | if ($file === null) { |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | |
295 | 295 | $fileContent = $this->psr2Fix($file->generate()); |
296 | 296 | $commentEnd = strpos($fileContent, ' */') + 3; |
297 | - $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1); |
|
297 | + $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1); |
|
298 | 298 | |
299 | 299 | $baseResultIteratorFilePath = $this->configuration->getPathFinder()->getPath($resultIteratorBaseNamespace.'\\'.$resultIteratorBaseClassName)->getPathname(); |
300 | 300 | $this->dumpFile($baseResultIteratorFilePath, $fileContent); |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | |
360 | 360 | $constructorMethod = new MethodGenerator( |
361 | 361 | '__construct', |
362 | - [ new ParameterGenerator('container', ContainerInterface::class) ], |
|
362 | + [new ParameterGenerator('container', ContainerInterface::class)], |
|
363 | 363 | MethodGenerator::FLAG_PUBLIC, |
364 | 364 | '$this->container = $container;' |
365 | 365 | ); |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | |
376 | 376 | $daoInstanceProperty = new PropertyGenerator($daoInstanceName); |
377 | 377 | $daoInstanceProperty->setVisibility(AbstractMemberGenerator::VISIBILITY_PRIVATE); |
378 | - $daoInstanceProperty->setDocBlock(new DocBlockGenerator(null, null, [new VarTag(null, ['\\' . $daoNamespace . '\\' . $daoClassName, 'null'])])); |
|
378 | + $daoInstanceProperty->setDocBlock(new DocBlockGenerator(null, null, [new VarTag(null, ['\\'.$daoNamespace.'\\'.$daoClassName, 'null'])])); |
|
379 | 379 | $class->addPropertyFromGenerator($daoInstanceProperty); |
380 | 380 | |
381 | 381 | $fullClassNameVarExport = var_export($daoNamespace.'\\'.$daoClassName, true); |
@@ -388,7 +388,7 @@ discard block |
||
388 | 388 | BODY; |
389 | 389 | |
390 | 390 | $getterMethod = new MethodGenerator( |
391 | - 'get' . $daoClassName, |
|
391 | + 'get'.$daoClassName, |
|
392 | 392 | [], |
393 | 393 | MethodGenerator::FLAG_PUBLIC, |
394 | 394 | $getterBody |
@@ -400,10 +400,10 @@ discard block |
||
400 | 400 | } |
401 | 401 | |
402 | 402 | $setterMethod = new MethodGenerator( |
403 | - 'set' . $daoClassName, |
|
404 | - [new ParameterGenerator($daoInstanceName, '\\' . $daoNamespace . '\\' . $daoClassName)], |
|
403 | + 'set'.$daoClassName, |
|
404 | + [new ParameterGenerator($daoInstanceName, '\\'.$daoNamespace.'\\'.$daoClassName)], |
|
405 | 405 | MethodGenerator::FLAG_PUBLIC, |
406 | - '$this->' . $daoInstanceName . ' = $' . $daoInstanceName . ';' |
|
406 | + '$this->'.$daoInstanceName.' = $'.$daoInstanceName.';' |
|
407 | 407 | ); |
408 | 408 | $setterMethod->setReturnType('void'); |
409 | 409 | $setterMethod = $this->configuration->getCodeGeneratorListener()->onDaoFactorySetterGenerated($setterMethod, $beanDescriptor, $this->configuration, $class); |
@@ -423,7 +423,7 @@ discard block |
||
423 | 423 | $fileContent = $this->psr2Fix($fileContent); |
424 | 424 | // Add the declare strict-types directive |
425 | 425 | $commentEnd = strpos($fileContent, ' */') + 3; |
426 | - $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1); |
|
426 | + $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1); |
|
427 | 427 | |
428 | 428 | $this->dumpFile($possibleFileName, $fileContent); |
429 | 429 | } |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | $map = [ |
531 | 531 | Type::TARRAY => 'array', |
532 | 532 | Type::SIMPLE_ARRAY => 'array', |
533 | - 'json' => 'array', // 'json' is supported from Doctrine DBAL 2.6 only. |
|
533 | + 'json' => 'array', // 'json' is supported from Doctrine DBAL 2.6 only. |
|
534 | 534 | Type::JSON_ARRAY => 'array', |
535 | 535 | Type::BIGINT => 'string', |
536 | 536 | Type::BOOLEAN => 'bool', |
@@ -19,12 +19,12 @@ |
||
19 | 19 | */ |
20 | 20 | private const LEVELS = array( |
21 | 21 | LogLevel::EMERGENCY, // 0 |
22 | - LogLevel::ALERT, // 1 |
|
23 | - LogLevel::CRITICAL, // 2 |
|
24 | - LogLevel::ERROR, // 3 |
|
25 | - LogLevel::WARNING, // 4 |
|
26 | - LogLevel::NOTICE, // 5 |
|
27 | - LogLevel::INFO, // 6 |
|
22 | + LogLevel::ALERT, // 1 |
|
23 | + LogLevel::CRITICAL, // 2 |
|
24 | + LogLevel::ERROR, // 3 |
|
25 | + LogLevel::WARNING, // 4 |
|
26 | + LogLevel::NOTICE, // 5 |
|
27 | + LogLevel::INFO, // 6 |
|
28 | 28 | LogLevel::DEBUG // 7 |
29 | 29 | ); |
30 | 30 |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | */ |
216 | 216 | public function getConstructorProperties(): array |
217 | 217 | { |
218 | - $constructorProperties = array_filter($this->beanPropertyDescriptors, static function (AbstractBeanPropertyDescriptor $property) { |
|
218 | + $constructorProperties = array_filter($this->beanPropertyDescriptors, static function(AbstractBeanPropertyDescriptor $property) { |
|
219 | 219 | return !$property instanceof InheritanceReferencePropertyDescriptor && $property->isCompulsory() && !$property->isReadOnly(); |
220 | 220 | }); |
221 | 221 | |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | public function getPropertiesWithDefault(): array |
231 | 231 | { |
232 | 232 | $properties = $this->getPropertiesForTable($this->table); |
233 | - $defaultProperties = array_filter($properties, function (AbstractBeanPropertyDescriptor $property) { |
|
233 | + $defaultProperties = array_filter($properties, function(AbstractBeanPropertyDescriptor $property) { |
|
234 | 234 | return $property->hasDefault(); |
235 | 235 | }); |
236 | 236 | |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | */ |
245 | 245 | public function getExposedProperties(): array |
246 | 246 | { |
247 | - $exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) { |
|
247 | + $exposedProperties = array_filter($this->beanPropertyDescriptors, function(AbstractBeanPropertyDescriptor $property) { |
|
248 | 248 | return !$property instanceof InheritanceReferencePropertyDescriptor && $property->getTable()->getName() === $this->table->getName(); |
249 | 249 | }); |
250 | 250 | |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | foreach ($beanPropertyDescriptors as $beanDescriptor) { |
351 | 351 | $name = $beanDescriptor->getGetterName(); |
352 | 352 | if (isset($names[$name])) { |
353 | - throw new TDBMException('Unsolvable name conflict while generating method name "' . $name . '"'); |
|
353 | + throw new TDBMException('Unsolvable name conflict while generating method name "'.$name.'"'); |
|
354 | 354 | } else { |
355 | 355 | $names[$name] = $beanDescriptor; |
356 | 356 | } |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | $assigns[] = $property->assignToDefaultCode()."\n"; |
400 | 400 | } |
401 | 401 | |
402 | - $body = $parentConstructorCode . implode('', $assigns); |
|
402 | + $body = $parentConstructorCode.implode('', $assigns); |
|
403 | 403 | |
404 | 404 | $constructor->setBody($body); |
405 | 405 | |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | $this->descriptorsByMethodName[$name][] = $descriptor; |
474 | 474 | $descriptors = $this->descriptorsByMethodName[$name]; |
475 | 475 | if (count($descriptors) > 1) { |
476 | - $properties = array_filter($descriptors, function ($descriptor) { |
|
476 | + $properties = array_filter($descriptors, function($descriptor) { |
|
477 | 477 | return $descriptor instanceof AbstractBeanPropertyDescriptor; |
478 | 478 | }); |
479 | 479 | $renameProperties = count($properties) > 1; |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | foreach ($this->getExposedProperties() as $beanPropertyDescriptor) { |
525 | 525 | $propertyCode = $beanPropertyDescriptor->getJsonSerializeCode(); |
526 | 526 | if (!empty($propertyCode)) { |
527 | - $body .= PHP_EOL . $propertyCode; |
|
527 | + $body .= PHP_EOL.$propertyCode; |
|
528 | 528 | } |
529 | 529 | } |
530 | 530 | |
@@ -532,11 +532,11 @@ discard block |
||
532 | 532 | foreach ($this->getMethodDescriptors() as $methodDescriptor) { |
533 | 533 | $methodCode = $methodDescriptor->getJsonSerializeCode(); |
534 | 534 | if (!empty($methodCode)) { |
535 | - $body .= PHP_EOL . $methodCode; |
|
535 | + $body .= PHP_EOL.$methodCode; |
|
536 | 536 | } |
537 | 537 | } |
538 | 538 | |
539 | - $body .= PHP_EOL . 'return $array;'; |
|
539 | + $body .= PHP_EOL.'return $array;'; |
|
540 | 540 | |
541 | 541 | $method->setBody($body); |
542 | 542 | |
@@ -631,10 +631,10 @@ discard block |
||
631 | 631 | /** @var AddInterface[] $addInterfaceAnnotations */ |
632 | 632 | $addInterfaceAnnotations = $this->annotationParser->getTableAnnotations($this->table)->findAnnotations(AddInterface::class); |
633 | 633 | |
634 | - $interfaces = [ JsonSerializable::class ]; |
|
634 | + $interfaces = [JsonSerializable::class]; |
|
635 | 635 | foreach ($addInterfaceAnnotations as $annotation) { |
636 | 636 | /** @phpstan-var class-string $className */ |
637 | - $className = $annotation->getName(); |
|
637 | + $className = $annotation->getName(); |
|
638 | 638 | $interfaces[] = $className; |
639 | 639 | } |
640 | 640 | |
@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | } |
674 | 674 | } elseif ($methodDescriptor instanceof PivotTableMethodsDescriptor) { |
675 | 675 | $pivotTableMethodsDescriptors[] = $methodDescriptor; |
676 | - [ $getter, $adder, $remover, $has, $setter ] = $methodDescriptor->getCode(); |
|
676 | + [$getter, $adder, $remover, $has, $setter] = $methodDescriptor->getCode(); |
|
677 | 677 | $methods = $this->codeGeneratorListener->onBaseBeanManyToManyGenerated($getter, $adder, $remover, $has, $setter, $methodDescriptor, $this, $this->configuration, $class); |
678 | 678 | foreach ($methods as $method) { |
679 | 679 | if ($method) { |
@@ -803,7 +803,7 @@ discard block |
||
803 | 803 | $interfaces = []; |
804 | 804 | foreach ($addInterfaceOnDaoAnnotations as $annotation) { |
805 | 805 | /** @phpstan-var class-string $className */ |
806 | - $className = $annotation->getName(); |
|
806 | + $className = $annotation->getName(); |
|
807 | 807 | $interfaces[] = $className; |
808 | 808 | } |
809 | 809 | |
@@ -825,7 +825,7 @@ discard block |
||
825 | 825 | |
826 | 826 | $constructorMethod = new MethodGenerator( |
827 | 827 | '__construct', |
828 | - [ new ParameterGenerator('tdbmService', TDBMService::class) ], |
|
828 | + [new ParameterGenerator('tdbmService', TDBMService::class)], |
|
829 | 829 | MethodGenerator::FLAG_PUBLIC, |
830 | 830 | '$this->tdbmService = $tdbmService;', |
831 | 831 | 'Sets the TDBM service used by this DAO.' |
@@ -837,7 +837,7 @@ discard block |
||
837 | 837 | |
838 | 838 | $saveMethod = new MethodGenerator( |
839 | 839 | 'save', |
840 | - [ new ParameterGenerator('obj', $beanClassName) ], |
|
840 | + [new ParameterGenerator('obj', $beanClassName)], |
|
841 | 841 | MethodGenerator::FLAG_PUBLIC, |
842 | 842 | '$this->tdbmService->save($obj);', |
843 | 843 | (new DocBlockGenerator( |
@@ -885,7 +885,7 @@ discard block |
||
885 | 885 | |
886 | 886 | foreach ($primaryKeyColumns as $primaryKeyColumn) { |
887 | 887 | if ($primaryKeyColumn === $lazyLoadingParameterName) { |
888 | - throw new TDBMException('Primary Column name `' . $lazyLoadingParameterName . '` is not allowed.'); |
|
888 | + throw new TDBMException('Primary Column name `'.$lazyLoadingParameterName.'` is not allowed.'); |
|
889 | 889 | } |
890 | 890 | $phpType = TDBMDaoGenerator::dbalTypeToPhpType($this->table->getColumn($primaryKeyColumn)->getType()); |
891 | 891 | $parameters[] = new ParameterGenerator($primaryKeyColumn, $phpType); |
@@ -901,7 +901,7 @@ discard block |
||
901 | 901 | 'getById', |
902 | 902 | $parameters, |
903 | 903 | MethodGenerator::FLAG_PUBLIC, |
904 | - "return \$this->tdbmService->findObjectByPk('$tableName', [" . implode(', ', $primaryKeyFilter) . "], [], \$$lazyLoadingParameterName, \\$beanClassName::class, \\$resultIteratorClass::class);", |
|
904 | + "return \$this->tdbmService->findObjectByPk('$tableName', [".implode(', ', $primaryKeyFilter)."], [], \$$lazyLoadingParameterName, \\$beanClassName::class, \\$resultIteratorClass::class);", |
|
905 | 905 | (new DocBlockGenerator( |
906 | 906 | "Get $beanClassWithoutNameSpace specified by its ID (its primary key).", |
907 | 907 | 'If the primary key does not exist, an exception is thrown.', |
@@ -1189,14 +1189,14 @@ discard block |
||
1189 | 1189 | $class->addUse(ResultIterator::class); |
1190 | 1190 | $class->setExtendedClass(ResultIterator::class); |
1191 | 1191 | } else { |
1192 | - $class->addUse($this->resultIteratorNamespace . '\\' . $extends); |
|
1192 | + $class->addUse($this->resultIteratorNamespace.'\\'.$extends); |
|
1193 | 1193 | $class->setExtendedClass($extends); |
1194 | 1194 | } |
1195 | 1195 | |
1196 | 1196 | $class->setDocBlock((new DocBlockGenerator( |
1197 | 1197 | "The $baseClassName class will iterate over results of $beanClassWithoutNameSpace class.", |
1198 | 1198 | null, |
1199 | - [new Tag\MethodTag('getIterator', ['\\' . $beanClassName . '[]'])] |
|
1199 | + [new Tag\MethodTag('getIterator', ['\\'.$beanClassName.'[]'])] |
|
1200 | 1200 | ))->setWordWrap(false)); |
1201 | 1201 | |
1202 | 1202 | $file = $this->codeGeneratorListener->onBaseResultIteratorGenerated($file, $this, $this->configuration); |
@@ -1252,7 +1252,7 @@ discard block |
||
1252 | 1252 | } |
1253 | 1253 | } |
1254 | 1254 | } |
1255 | - usort($methods, static function (MethodGenerator $methodA, MethodGenerator $methodB) { |
|
1255 | + usort($methods, static function(MethodGenerator $methodA, MethodGenerator $methodB) { |
|
1256 | 1256 | return $methodA->getName() <=> $methodB->getName(); |
1257 | 1257 | }); |
1258 | 1258 | |
@@ -1401,11 +1401,11 @@ discard block |
||
1401 | 1401 | |
1402 | 1402 | if ($index->isUnique()) { |
1403 | 1403 | $parameters[] = new ParameterGenerator('additionalTablesFetch', 'array', []); |
1404 | - $params[] = new ParamTag('additionalTablesFetch', [ 'string[]' ], 'A list of additional tables to fetch (for performance improvement)'); |
|
1405 | - $params[] = new ReturnTag([ '\\'.$beanNamespace.'\\'.$beanClassName, 'null' ]); |
|
1404 | + $params[] = new ParamTag('additionalTablesFetch', ['string[]'], 'A list of additional tables to fetch (for performance improvement)'); |
|
1405 | + $params[] = new ReturnTag(['\\'.$beanNamespace.'\\'.$beanClassName, 'null']); |
|
1406 | 1406 | $method->setReturnType('?\\'.$beanNamespace.'\\'.$beanClassName); |
1407 | 1407 | |
1408 | - $docBlock = new DocBlockGenerator("Get a $beanClassName filtered by ".implode(', ', $commentArguments). '.', null, $params); |
|
1408 | + $docBlock = new DocBlockGenerator("Get a $beanClassName filtered by ".implode(', ', $commentArguments).'.', null, $params); |
|
1409 | 1409 | $docBlock->setWordWrap(false); |
1410 | 1410 | |
1411 | 1411 | $body = "\$filter = [ |
@@ -1414,12 +1414,12 @@ discard block |
||
1414 | 1414 | "; |
1415 | 1415 | } else { |
1416 | 1416 | $parameters[] = (new ParameterGenerator('orderBy'))->setDefaultValue(null); |
1417 | - $params[] = new ParamTag('orderBy', [ 'mixed' ], 'The order string'); |
|
1417 | + $params[] = new ParamTag('orderBy', ['mixed'], 'The order string'); |
|
1418 | 1418 | $parameters[] = new ParameterGenerator('additionalTablesFetch', 'array', []); |
1419 | - $params[] = new ParamTag('additionalTablesFetch', [ 'string[]' ], 'A list of additional tables to fetch (for performance improvement)'); |
|
1419 | + $params[] = new ParamTag('additionalTablesFetch', ['string[]'], 'A list of additional tables to fetch (for performance improvement)'); |
|
1420 | 1420 | $parameters[] = (new ParameterGenerator('mode', '?int'))->setDefaultValue(null); |
1421 | - $params[] = new ParamTag('mode', [ 'int', 'null' ], 'Either TDBMService::MODE_ARRAY or TDBMService::MODE_CURSOR (for large datasets). Defaults to TDBMService::MODE_ARRAY.'); |
|
1422 | - $method->setReturnType($this->resultIteratorNamespace . '\\' . $this->getResultIteratorClassName()); |
|
1421 | + $params[] = new ParamTag('mode', ['int', 'null'], 'Either TDBMService::MODE_ARRAY or TDBMService::MODE_CURSOR (for large datasets). Defaults to TDBMService::MODE_ARRAY.'); |
|
1422 | + $method->setReturnType($this->resultIteratorNamespace.'\\'.$this->getResultIteratorClassName()); |
|
1423 | 1423 | |
1424 | 1424 | $docBlock = new DocBlockGenerator("Get a list of $beanClassName filtered by ".implode(', ', $commentArguments).".", null, $params); |
1425 | 1425 | $docBlock->setWordWrap(false); |
@@ -1479,8 +1479,8 @@ discard block |
||
1479 | 1479 | var_export($tdbmFk->getCacheKey(), true), |
1480 | 1480 | 'null', |
1481 | 1481 | var_export($this->table->getName(), true), |
1482 | - '\\' . $this->beanNamespace . '\\' . $this->namingStrategy->getBeanClassName($foreignTableName) . '::class', |
|
1483 | - '\\' . $this->resultIteratorNamespace . '\\' . $this->namingStrategy->getResultIteratorClassName($foreignTableName) . '::class' |
|
1482 | + '\\'.$this->beanNamespace.'\\'.$this->namingStrategy->getBeanClassName($foreignTableName).'::class', |
|
1483 | + '\\'.$this->resultIteratorNamespace.'\\'.$this->namingStrategy->getResultIteratorClassName($foreignTableName).'::class' |
|
1484 | 1484 | ); |
1485 | 1485 | } |
1486 | 1486 | } |
@@ -1754,17 +1754,17 @@ discard block |
||
1754 | 1754 | * @param string $indent |
1755 | 1755 | * @return string |
1756 | 1756 | */ |
1757 | - private function psr2VarExport($var, string $indent=''): string |
|
1757 | + private function psr2VarExport($var, string $indent = ''): string |
|
1758 | 1758 | { |
1759 | 1759 | if (is_array($var)) { |
1760 | 1760 | $indexed = array_keys($var) === range(0, count($var) - 1); |
1761 | 1761 | $r = []; |
1762 | 1762 | foreach ($var as $key => $value) { |
1763 | 1763 | $r[] = "$indent " |
1764 | - . ($indexed ? '' : $this->psr2VarExport($key) . ' => ') |
|
1764 | + . ($indexed ? '' : $this->psr2VarExport($key).' => ') |
|
1765 | 1765 | . $this->psr2VarExport($value, "$indent "); |
1766 | 1766 | } |
1767 | - return "[\n" . implode(",\n", $r) . "\n" . $indent . ']'; |
|
1767 | + return "[\n".implode(",\n", $r)."\n".$indent.']'; |
|
1768 | 1768 | } |
1769 | 1769 | return var_export($var, true); |
1770 | 1770 | } |