@@ -39,7 +39,7 @@ |
||
39 | 39 | */ |
40 | 40 | public function findAnnotations(string $annotationType): array |
41 | 41 | { |
42 | - return array_values(array_filter($this->annotations, function ($annotation) use ($annotationType) { |
|
42 | + return array_values(array_filter($this->annotations, function($annotation) use ($annotationType) { |
|
43 | 43 | return is_a($annotation, $annotationType); |
44 | 44 | })); |
45 | 45 | } |
@@ -71,7 +71,7 @@ |
||
71 | 71 | |
72 | 72 | // Let's add * in front of the line (otherwise, parsing is failing) |
73 | 73 | $lines = explode("\n", $comment); |
74 | - $lines = array_map(function (string $line) { |
|
74 | + $lines = array_map(function(string $line) { |
|
75 | 75 | return '* '.$line; |
76 | 76 | }, $lines); |
77 | 77 | $comment = implode("\n", $lines); |
@@ -88,11 +88,11 @@ discard block |
||
88 | 88 | |
89 | 89 | // Remove all beans and daos from junction tables |
90 | 90 | $junctionTables = $this->configuration->getSchemaAnalyzer()->detectJunctionTables(true); |
91 | - $junctionTableNames = array_map(function (Table $table) { |
|
91 | + $junctionTableNames = array_map(function(Table $table) { |
|
92 | 92 | return $table->getName(); |
93 | 93 | }, $junctionTables); |
94 | 94 | |
95 | - $tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) { |
|
95 | + $tableList = array_filter($tableList, function(Table $table) use ($junctionTableNames) { |
|
96 | 96 | return !in_array($table->getName(), $junctionTableNames, true); |
97 | 97 | }); |
98 | 98 | |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $fileContent = $this->psr2Fix($fileContent); |
171 | 171 | // Add the declare strict-types directive |
172 | 172 | $commentEnd = strpos($fileContent, ' */') + 3; |
173 | - $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1); |
|
173 | + $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1); |
|
174 | 174 | |
175 | 175 | $this->dumpFile($possibleBaseFileName, $fileContent); |
176 | 176 | |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | $fileContent = $this->psr2Fix($fileContent); |
233 | 233 | // Add the declare strict-types directive |
234 | 234 | $commentEnd = strpos($fileContent, ' */') + 3; |
235 | - $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1); |
|
235 | + $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1); |
|
236 | 236 | |
237 | 237 | $this->dumpFile($possibleBaseFileName, $fileContent); |
238 | 238 | |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | $resultIteratorClassName = $beanDescriptor->getResultIteratorClassName(); |
291 | 291 | $resultIteratorBaseClassName = $beanDescriptor->getBaseResultIteratorClassName(); |
292 | 292 | $resultIteratorNamespace = $this->configuration->getResultIteratorNamespace(); |
293 | - $resultIteratorBaseNamespace = $resultIteratorNamespace . '\\Generated'; |
|
293 | + $resultIteratorBaseNamespace = $resultIteratorNamespace.'\\Generated'; |
|
294 | 294 | $beanClassWithoutNameSpace = $beanDescriptor->getBeanClassName(); |
295 | 295 | $file = $beanDescriptor->generateResultIteratorPhpCode(); |
296 | 296 | if ($file === null) { |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | |
300 | 300 | $fileContent = $this->psr2Fix($file->generate()); |
301 | 301 | $commentEnd = strpos($fileContent, ' */') + 3; |
302 | - $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1); |
|
302 | + $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1); |
|
303 | 303 | |
304 | 304 | $baseResultIteratorFilePath = $this->configuration->getPathFinder()->getPath($resultIteratorBaseNamespace.'\\'.$resultIteratorBaseClassName)->getPathname(); |
305 | 305 | $this->dumpFile($baseResultIteratorFilePath, $fileContent); |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | |
365 | 365 | $constructorMethod = new MethodGenerator( |
366 | 366 | '__construct', |
367 | - [ new ParameterGenerator('container', ContainerInterface::class) ], |
|
367 | + [new ParameterGenerator('container', ContainerInterface::class)], |
|
368 | 368 | MethodGenerator::FLAG_PUBLIC, |
369 | 369 | '$this->container = $container;' |
370 | 370 | ); |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | |
381 | 381 | $daoInstanceProperty = new PropertyGenerator($daoInstanceName); |
382 | 382 | $daoInstanceProperty->setVisibility(AbstractMemberGenerator::VISIBILITY_PRIVATE); |
383 | - $daoInstanceProperty->setDocBlock(new DocBlockGenerator(null, null, [new VarTag(null, ['\\' . $daoNamespace . '\\' . $daoClassName, 'null'])])); |
|
383 | + $daoInstanceProperty->setDocBlock(new DocBlockGenerator(null, null, [new VarTag(null, ['\\'.$daoNamespace.'\\'.$daoClassName, 'null'])])); |
|
384 | 384 | $class->addPropertyFromGenerator($daoInstanceProperty); |
385 | 385 | |
386 | 386 | $fullClassNameVarExport = var_export($daoNamespace.'\\'.$daoClassName, true); |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | BODY; |
394 | 394 | |
395 | 395 | $getterMethod = new MethodGenerator( |
396 | - 'get' . $daoClassName, |
|
396 | + 'get'.$daoClassName, |
|
397 | 397 | [], |
398 | 398 | MethodGenerator::FLAG_PUBLIC, |
399 | 399 | $getterBody |
@@ -405,10 +405,10 @@ discard block |
||
405 | 405 | } |
406 | 406 | |
407 | 407 | $setterMethod = new MethodGenerator( |
408 | - 'set' . $daoClassName, |
|
409 | - [new ParameterGenerator($daoInstanceName, '\\' . $daoNamespace . '\\' . $daoClassName)], |
|
408 | + 'set'.$daoClassName, |
|
409 | + [new ParameterGenerator($daoInstanceName, '\\'.$daoNamespace.'\\'.$daoClassName)], |
|
410 | 410 | MethodGenerator::FLAG_PUBLIC, |
411 | - '$this->' . $daoInstanceName . ' = $' . $daoInstanceName . ';' |
|
411 | + '$this->'.$daoInstanceName.' = $'.$daoInstanceName.';' |
|
412 | 412 | ); |
413 | 413 | $setterMethod->setReturnType('void'); |
414 | 414 | $setterMethod = $this->configuration->getCodeGeneratorListener()->onDaoFactorySetterGenerated($setterMethod, $beanDescriptor, $this->configuration, $class); |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | $fileContent = $this->psr2Fix($fileContent); |
429 | 429 | // Add the declare strict-types directive |
430 | 430 | $commentEnd = strpos($fileContent, ' */') + 3; |
431 | - $fileContent = substr($fileContent, 0, $commentEnd) . "\n\ndeclare(strict_types=1);" . substr($fileContent, $commentEnd + 1); |
|
431 | + $fileContent = substr($fileContent, 0, $commentEnd)."\n\ndeclare(strict_types=1);".substr($fileContent, $commentEnd + 1); |
|
432 | 432 | |
433 | 433 | $this->dumpFile($possibleFileName, $fileContent); |
434 | 434 | } |
@@ -535,7 +535,7 @@ discard block |
||
535 | 535 | $map = [ |
536 | 536 | Type::TARRAY => 'array', |
537 | 537 | Type::SIMPLE_ARRAY => 'array', |
538 | - 'json' => 'array', // 'json' is supported from Doctrine DBAL 2.6 only. |
|
538 | + 'json' => 'array', // 'json' is supported from Doctrine DBAL 2.6 only. |
|
539 | 539 | Type::JSON_ARRAY => 'array', |
540 | 540 | Type::BIGINT => 'string', |
541 | 541 | Type::BOOLEAN => 'bool', |
@@ -71,9 +71,9 @@ discard block |
||
71 | 71 | public function getName() : string |
72 | 72 | { |
73 | 73 | if (!$this->useAlternateName) { |
74 | - return 'get' . $this->getPropertyName(); |
|
74 | + return 'get'.$this->getPropertyName(); |
|
75 | 75 | } else { |
76 | - $methodName = 'get' . $this->getPropertyName() . 'By'; |
|
76 | + $methodName = 'get'.$this->getPropertyName().'By'; |
|
77 | 77 | |
78 | 78 | $camelizedColumns = array_map([TDBMDaoGenerator::class, 'toCamelCase'], $this->foreignKey->getUnquotedLocalColumns()); |
79 | 79 | |
@@ -128,12 +128,12 @@ discard block |
||
128 | 128 | $getter = new MethodGenerator($this->getName()); |
129 | 129 | |
130 | 130 | if ($this->hasLocalUniqueIndex()) { |
131 | - $classType = '\\' . $this->beanNamespace . '\\' . $beanClass; |
|
131 | + $classType = '\\'.$this->beanNamespace.'\\'.$beanClass; |
|
132 | 132 | $getterDocBlock = new DocBlockGenerator(sprintf('Returns the %s pointing to this bean via the %s column.', $beanClass, implode(', ', $this->foreignKey->getUnquotedLocalColumns()))); |
133 | - $getterDocBlock->setTag([new ReturnTag([$classType . '|null'])]); |
|
133 | + $getterDocBlock->setTag([new ReturnTag([$classType.'|null'])]); |
|
134 | 134 | $getterDocBlock->setWordWrap(false); |
135 | 135 | $getter->setDocBlock($getterDocBlock); |
136 | - $getter->setReturnType('?' . $classType); |
|
136 | + $getter->setReturnType('?'.$classType); |
|
137 | 137 | |
138 | 138 | $code = sprintf( |
139 | 139 | 'return $this->retrieveManyToOneRelationshipsStorage(%s, %s, %s)->first();', |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | ); |
144 | 144 | } else { |
145 | 145 | $getterDocBlock = new DocBlockGenerator(sprintf('Returns the list of %s pointing to this bean via the %s column.', $beanClass, implode(', ', $this->foreignKey->getUnquotedLocalColumns()))); |
146 | - $getterDocBlock->setTag(new ReturnTag([$beanClass . '[]', '\\' . AlterableResultIterator::class])); |
|
146 | + $getterDocBlock->setTag(new ReturnTag([$beanClass.'[]', '\\'.AlterableResultIterator::class])); |
|
147 | 147 | $getterDocBlock->setWordWrap(false); |
148 | 148 | $getter->setDocBlock($getterDocBlock); |
149 | 149 | $getter->setReturnType(AlterableResultIterator::class); |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $getter->setVisibility(AbstractMemberGenerator::VISIBILITY_PROTECTED); |
163 | 163 | } |
164 | 164 | |
165 | - return [ $getter ]; |
|
165 | + return [$getter]; |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | private function getFilters(ForeignKeyConstraint $fk) : string |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | /** @var Annotation\JsonFormat|null $jsonFormat */ |
234 | 234 | $jsonFormat = $this->findAnnotation(Annotation\JsonFormat::class); |
235 | 235 | if ($jsonFormat !== null) { |
236 | - $method = $jsonFormat->method ?? 'get' . ucfirst($jsonFormat->property); |
|
236 | + $method = $jsonFormat->method ?? 'get'.ucfirst($jsonFormat->property); |
|
237 | 237 | $format = "$method()"; |
238 | 238 | } else { |
239 | 239 | $stopRecursion = $this->findAnnotation(Annotation\JsonRecursive::class) ? '' : 'true'; |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | $isIncluded = $this->findAnnotation(Annotation\JsonInclude::class) !== null; |
243 | 243 | $index = $jsonCollection->key ?: lcfirst($this->getPropertyName()); |
244 | 244 | $class = $this->getBeanClassName(); |
245 | - $variableName = '$' . TDBMDaoGenerator::toVariableName($class); |
|
245 | + $variableName = '$'.TDBMDaoGenerator::toVariableName($class); |
|
246 | 246 | $getter = $this->getName(); |
247 | 247 | if ($this->hasLocalUniqueIndex()) { |
248 | 248 | $code = "\$array['$index'] = (\$object = \$this->$getter()) ? \$object->$format : null;"; |
@@ -51,11 +51,11 @@ |
||
51 | 51 | $this->registry[$table->getName()] = new BeanDescriptor( |
52 | 52 | $table, |
53 | 53 | $this->configuration->getBeanNamespace(), |
54 | - $this->configuration->getBeanNamespace() . '\\Generated', |
|
54 | + $this->configuration->getBeanNamespace().'\\Generated', |
|
55 | 55 | $this->configuration->getDaoNamespace(), |
56 | - $this->configuration->getDaoNamespace() . '\\Generated', |
|
56 | + $this->configuration->getDaoNamespace().'\\Generated', |
|
57 | 57 | $this->configuration->getResultIteratorNamespace(), |
58 | - $this->configuration->getResultIteratorNamespace() . '\\Generated', |
|
58 | + $this->configuration->getResultIteratorNamespace().'\\Generated', |
|
59 | 59 | $this->configuration->getSchemaAnalyzer(), |
60 | 60 | $this->schema, |
61 | 61 | $this->tdbmSchemaAnalyzer, |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | 'time', |
163 | 163 | 'time_immutable', |
164 | 164 | ], true)) { |
165 | - if ($default !== null && in_array(strtoupper($default), ['CURRENT_TIMESTAMP' /* MySQL */, 'NOW()' /* PostgreSQL */, 'SYSDATE' /* Oracle */ , 'CURRENT_TIMESTAMP()' /* MariaDB 10.3 */], true)) { |
|
165 | + if ($default !== null && in_array(strtoupper($default), ['CURRENT_TIMESTAMP' /* MySQL */, 'NOW()' /* PostgreSQL */, 'SYSDATE' /* Oracle */, 'CURRENT_TIMESTAMP()' /* MariaDB 10.3 */], true)) { |
|
166 | 166 | $defaultCode = 'new \DateTimeImmutable()'; |
167 | 167 | } else { |
168 | 168 | throw new TDBMException('Unable to set default value for date in "'.$this->table->getName().'.'.$this->column->getName().'". Database passed this default value: "'.$default.'"'); |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | case 'v4': |
187 | 187 | return 'Uuid::uuid4()->toString()'; |
188 | 188 | default: |
189 | - throw new TDBMException('@UUID annotation accepts either "v1" or "v4" parameter. Unexpected parameter: ' . $comment); |
|
189 | + throw new TDBMException('@UUID annotation accepts either "v1" or "v4" parameter. Unexpected parameter: '.$comment); |
|
190 | 190 | } |
191 | 191 | } |
192 | 192 | |
@@ -234,14 +234,14 @@ discard block |
||
234 | 234 | $resourceTypeCheck = sprintf($resourceTypeCheck, $checkNullable, $variableName, $variableName); |
235 | 235 | } |
236 | 236 | |
237 | - $types = [ $normalizedType ]; |
|
237 | + $types = [$normalizedType]; |
|
238 | 238 | if ($isNullable) { |
239 | 239 | $types[] = 'null'; |
240 | 240 | } |
241 | 241 | |
242 | 242 | $paramType = null; |
243 | 243 | if ($this->isTypeHintable()) { |
244 | - $paramType = ($isNullable?'?':'').$normalizedType; |
|
244 | + $paramType = ($isNullable ? '?' : '').$normalizedType; |
|
245 | 245 | } |
246 | 246 | |
247 | 247 | $getter = new MethodGenerator($columnGetterName); |
@@ -337,11 +337,11 @@ discard block |
||
337 | 337 | break; |
338 | 338 | } |
339 | 339 | } |
340 | - $args = array_map(function ($v) { |
|
340 | + $args = array_map(function($v) { |
|
341 | 341 | return var_export($v, true); |
342 | 342 | }, $args); |
343 | - $args = empty($args) ? '' : ', ' . implode(', ', $args); |
|
344 | - $unit = $jsonFormat->unit ? ' . ' . var_export($jsonFormat->unit, true) : ''; |
|
343 | + $args = empty($args) ? '' : ', '.implode(', ', $args); |
|
344 | + $unit = $jsonFormat->unit ? ' . '.var_export($jsonFormat->unit, true) : ''; |
|
345 | 345 | if ($this->column->getNotnull()) { |
346 | 346 | return "\$array['$index'] = number_format(\$this->$getter()$args)$unit;"; |
347 | 347 | } else { |
@@ -19,12 +19,12 @@ |
||
19 | 19 | */ |
20 | 20 | private static $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 |
@@ -76,7 +76,7 @@ |
||
76 | 76 | if ($index->isUnique()) { |
77 | 77 | return 'findOneBy'.implode('And', $methodNameComponent); |
78 | 78 | } else { |
79 | - return 'findBy' . implode('And', $methodNameComponent); |
|
79 | + return 'findBy'.implode('And', $methodNameComponent); |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 | } |
@@ -50,7 +50,7 @@ |
||
50 | 50 | |
51 | 51 | $pkColumnNames = $this->tdbmService->getPrimaryKeyColumns($this->mainTable); |
52 | 52 | $mysqlPlatform = new MySqlPlatform(); |
53 | - $pkColumnNames = array_map(function ($pkColumn) use ($mysqlPlatform) { |
|
53 | + $pkColumnNames = array_map(function($pkColumn) use ($mysqlPlatform) { |
|
54 | 54 | return $mysqlPlatform->quoteIdentifier($this->mainTable).'.'.$mysqlPlatform->quoteIdentifier($pkColumn); |
55 | 55 | }, $pkColumnNames); |
56 | 56 |