@@ -724,13 +724,13 @@ |
||
| 724 | 724 | } |
| 725 | 725 | |
| 726 | 726 | $replacements = array( |
| 727 | - '<description>' => ucfirst($type).' '.$variableName, |
|
| 728 | - '<methodTypeHint>' => $methodTypeHint, |
|
| 729 | - '<variableType>' => $variableType, |
|
| 730 | - '<variableName>' => $variableName, |
|
| 731 | - '<methodName>' => $methodName, |
|
| 732 | - '<fieldName>' => $fieldName, |
|
| 733 | - '<variableDefault>' => ($defaultValue !== null ) ? (' = '.$defaultValue) : '' |
|
| 727 | + '<description>' => ucfirst($type).' '.$variableName, |
|
| 728 | + '<methodTypeHint>' => $methodTypeHint, |
|
| 729 | + '<variableType>' => $variableType, |
|
| 730 | + '<variableName>' => $variableName, |
|
| 731 | + '<methodName>' => $methodName, |
|
| 732 | + '<fieldName>' => $fieldName, |
|
| 733 | + '<variableDefault>' => ($defaultValue !== null ) ? (' = '.$defaultValue) : '' |
|
| 734 | 734 | ); |
| 735 | 735 | |
| 736 | 736 | $method = str_replace( |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | $body = str_replace('<spaces>', $this->spaces, $body); |
| 357 | 357 | $last = strrpos($currentCode, '}'); |
| 358 | 358 | |
| 359 | - return substr($currentCode, 0, $last) . $body . (strlen($body) > 0 ? "\n" : '') . "}\n"; |
|
| 359 | + return substr($currentCode, 0, $last).$body.(strlen($body) > 0 ? "\n" : '')."}\n"; |
|
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | /** |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | protected function generateEntityNamespace() |
| 366 | 366 | { |
| 367 | 367 | if ($this->hasNamespace($this->mapperInfo->className())) { |
| 368 | - return 'namespace ' . $this->getNamespace($this->mapperInfo->className()) .';' . "\n\n"; |
|
| 368 | + return 'namespace '.$this->getNamespace($this->mapperInfo->className()).';'."\n\n"; |
|
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | 371 | |
@@ -379,18 +379,18 @@ discard block |
||
| 379 | 379 | $use = []; |
| 380 | 380 | |
| 381 | 381 | if ($this->hasNamespace($this->getClassToExtend())) { |
| 382 | - $use[$this->getClassToExtend()] = 'use ' . $this->getClassToExtend() . ';'; |
|
| 382 | + $use[$this->getClassToExtend()] = 'use '.$this->getClassToExtend().';'; |
|
| 383 | 383 | } |
| 384 | 384 | |
| 385 | 385 | foreach ($this->interfaces as $interface) { |
| 386 | 386 | if ($this->hasNamespace($interface)) { |
| 387 | - $use[$interface] = 'use ' . $interface . ';'; |
|
| 387 | + $use[$interface] = 'use '.$interface.';'; |
|
| 388 | 388 | } |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | 391 | foreach ($this->traits as $trait) { |
| 392 | 392 | if ($this->hasNamespace($trait)) { |
| 393 | - $use[$trait] = 'use ' . $trait . ';'; |
|
| 393 | + $use[$trait] = 'use '.$trait.';'; |
|
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | |
| 421 | 421 | sort($use); |
| 422 | 422 | |
| 423 | - return implode("\n", $use) . "\n\n"; |
|
| 423 | + return implode("\n", $use)."\n\n"; |
|
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | /** |
@@ -428,9 +428,9 @@ discard block |
||
| 428 | 428 | */ |
| 429 | 429 | protected function generateEntityClassName() |
| 430 | 430 | { |
| 431 | - return 'class ' . $this->getClassName($this->mapperInfo->className()) . |
|
| 432 | - ($this->classToExtend ? ' extends ' . $this->getClassToExtendName() : null) . |
|
| 433 | - ($this->interfaces ? ' implements ' . $this->getInterfacesToImplement() : null); |
|
| 431 | + return 'class '.$this->getClassName($this->mapperInfo->className()). |
|
| 432 | + ($this->classToExtend ? ' extends '.$this->getClassToExtendName() : null). |
|
| 433 | + ($this->interfaces ? ' implements '.$this->getInterfacesToImplement() : null); |
|
| 434 | 434 | } |
| 435 | 435 | |
| 436 | 436 | /** |
@@ -445,10 +445,10 @@ discard block |
||
| 445 | 445 | $traits = ''; |
| 446 | 446 | |
| 447 | 447 | foreach ($this->traits as $trait) { |
| 448 | - $traits .= $this->spaces . 'use ' . $this->getRelativeClassName($trait) . ';' . "\n"; |
|
| 448 | + $traits .= $this->spaces.'use '.$this->getRelativeClassName($trait).';'."\n"; |
|
| 449 | 449 | } |
| 450 | 450 | |
| 451 | - return $traits . "\n"; |
|
| 451 | + return $traits."\n"; |
|
| 452 | 452 | } |
| 453 | 453 | |
| 454 | 454 | /** |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | { |
| 554 | 554 | $lines = array(); |
| 555 | 555 | $lines[] = '/**'; |
| 556 | - $lines[] = ' * ' . $this->getClassName($this->mapperInfo->className()); |
|
| 556 | + $lines[] = ' * '.$this->getClassName($this->mapperInfo->className()); |
|
| 557 | 557 | $lines[] = ' */'; |
| 558 | 558 | |
| 559 | 559 | return implode("\n", $lines); |
@@ -684,7 +684,7 @@ discard block |
||
| 684 | 684 | $variableName = Inflector::camelize($fieldName); |
| 685 | 685 | $methodName = $variableName; |
| 686 | 686 | } else { |
| 687 | - $methodName = $type . Inflector::classify($fieldName); |
|
| 687 | + $methodName = $type.Inflector::classify($fieldName); |
|
| 688 | 688 | $variableName = Inflector::camelize($fieldName); |
| 689 | 689 | } |
| 690 | 690 | |
@@ -701,7 +701,7 @@ discard block |
||
| 701 | 701 | |
| 702 | 702 | if ($propertyInfo->isObject()) { |
| 703 | 703 | $variableType = $this->getRelativeClassName($propertyInfo->className()); |
| 704 | - $methodTypeHint = $variableType.' '; |
|
| 704 | + $methodTypeHint = $variableType.' '; |
|
| 705 | 705 | } else { |
| 706 | 706 | $variableType = $propertyInfo->phpType(); |
| 707 | 707 | $methodTypeHint = null; |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | '<variableName>' => $variableName, |
| 731 | 731 | '<methodName>' => $methodName, |
| 732 | 732 | '<fieldName>' => $fieldName, |
| 733 | - '<variableDefault>' => ($defaultValue !== null ) ? (' = '.$defaultValue) : '' |
|
| 733 | + '<variableDefault>' => ($defaultValue !== null) ? (' = '.$defaultValue) : '' |
|
| 734 | 734 | ); |
| 735 | 735 | |
| 736 | 736 | $method = str_replace( |
@@ -805,9 +805,9 @@ discard block |
||
| 805 | 805 | protected function generateFieldMappingPropertyDocBlock($property) |
| 806 | 806 | { |
| 807 | 807 | $lines = array(); |
| 808 | - $lines[] = $this->spaces . '/**'; |
|
| 809 | - $lines[] = $this->spaces . ' * @var '.$property->phpType(); |
|
| 810 | - $lines[] = $this->spaces . ' */'; |
|
| 808 | + $lines[] = $this->spaces.'/**'; |
|
| 809 | + $lines[] = $this->spaces.' * @var '.$property->phpType(); |
|
| 810 | + $lines[] = $this->spaces.' */'; |
|
| 811 | 811 | |
| 812 | 812 | return implode("\n", $lines); |
| 813 | 813 | } |
@@ -836,9 +836,9 @@ discard block |
||
| 836 | 836 | } |
| 837 | 837 | |
| 838 | 838 | $lines = array(); |
| 839 | - $lines[] = $this->spaces . '/**'; |
|
| 840 | - $lines[] = $this->spaces . ' * @var '.$className; |
|
| 841 | - $lines[] = $this->spaces . ' */'; |
|
| 839 | + $lines[] = $this->spaces.'/**'; |
|
| 840 | + $lines[] = $this->spaces.' * @var '.$className; |
|
| 841 | + $lines[] = $this->spaces.' */'; |
|
| 842 | 842 | |
| 843 | 843 | return implode("\n", $lines); |
| 844 | 844 | } |
@@ -879,7 +879,7 @@ discard block |
||
| 879 | 879 | |
| 880 | 880 | if ($inClass) { |
| 881 | 881 | $inClass = false; |
| 882 | - $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1]; |
|
| 882 | + $lastSeenClass = $lastSeenNamespace.($lastSeenNamespace ? '\\' : '').$token[1]; |
|
| 883 | 883 | $this->staticReflection[$lastSeenClass]['properties'] = array(); |
| 884 | 884 | $this->staticReflection[$lastSeenClass]['methods'] = array(); |
| 885 | 885 | } |
@@ -887,16 +887,16 @@ discard block |
||
| 887 | 887 | if ($token[0] == T_NAMESPACE) { |
| 888 | 888 | $lastSeenNamespace = ""; |
| 889 | 889 | $inNamespace = true; |
| 890 | - } elseif ($token[0] == T_CLASS && $tokens[$i-1][0] != T_DOUBLE_COLON) { |
|
| 890 | + } elseif ($token[0] == T_CLASS && $tokens[$i - 1][0] != T_DOUBLE_COLON) { |
|
| 891 | 891 | $inClass = true; |
| 892 | 892 | } elseif ($token[0] == T_FUNCTION) { |
| 893 | - if ($tokens[$i+2][0] == T_STRING) { |
|
| 894 | - $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+2][1]); |
|
| 895 | - } elseif ($tokens[$i+2] == "&" && $tokens[$i+3][0] == T_STRING) { |
|
| 896 | - $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+3][1]); |
|
| 893 | + if ($tokens[$i + 2][0] == T_STRING) { |
|
| 894 | + $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 2][1]); |
|
| 895 | + } elseif ($tokens[$i + 2] == "&" && $tokens[$i + 3][0] == T_STRING) { |
|
| 896 | + $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 3][1]); |
|
| 897 | 897 | } |
| 898 | - } elseif (in_array($token[0], array(T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED)) && $tokens[$i+2][0] != T_FUNCTION) { |
|
| 899 | - $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i+2][1], 1); |
|
| 898 | + } elseif (in_array($token[0], array(T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED)) && $tokens[$i + 2][0] != T_FUNCTION) { |
|
| 899 | + $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i + 2][1], 1); |
|
| 900 | 900 | } |
| 901 | 901 | } |
| 902 | 902 | } |
@@ -971,7 +971,7 @@ discard block |
||
| 971 | 971 | if ($this->hasNamespace($className)) { |
| 972 | 972 | return $this->getClassName($className); |
| 973 | 973 | } else { |
| 974 | - return '\\' . $className; |
|
| 974 | + return '\\'.$className; |
|
| 975 | 975 | } |
| 976 | 976 | } |
| 977 | 977 | |
@@ -1072,8 +1072,8 @@ discard block |
||
| 1072 | 1072 | $lines = explode("\n", $code); |
| 1073 | 1073 | |
| 1074 | 1074 | foreach ($lines as $key => $value) { |
| 1075 | - if ( ! empty($value)) { |
|
| 1076 | - $lines[$key] = str_repeat($this->spaces, $num) . $lines[$key]; |
|
| 1075 | + if (!empty($value)) { |
|
| 1076 | + $lines[$key] = str_repeat($this->spaces, $num).$lines[$key]; |
|
| 1077 | 1077 | } |
| 1078 | 1078 | } |
| 1079 | 1079 | |
@@ -1102,7 +1102,7 @@ discard block |
||
| 1102 | 1102 | } |
| 1103 | 1103 | |
| 1104 | 1104 | if (is_string($value)) { |
| 1105 | - return "'" . $value . "'"; |
|
| 1105 | + return "'".$value."'"; |
|
| 1106 | 1106 | } |
| 1107 | 1107 | |
| 1108 | 1108 | if (is_bool($value)) { |
@@ -1239,7 +1239,7 @@ discard block |
||
| 1239 | 1239 | public function setFieldVisibility(string $visibility): void |
| 1240 | 1240 | { |
| 1241 | 1241 | if ($visibility !== static::FIELD_VISIBLE_PRIVATE && $visibility !== static::FIELD_VISIBLE_PROTECTED) { |
| 1242 | - throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): ' . $visibility); |
|
| 1242 | + throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): '.$visibility); |
|
| 1243 | 1243 | } |
| 1244 | 1244 | |
| 1245 | 1245 | $this->fieldVisibility = $visibility; |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | */ |
| 92 | 92 | public function join($query, $alias = null) |
| 93 | 93 | { |
| 94 | - $parts = explode('#', (string)$alias); |
|
| 94 | + $parts = explode('#', (string) $alias); |
|
| 95 | 95 | |
| 96 | 96 | if (!isset($parts[1])) { |
| 97 | 97 | throw new \LogicException('Joins are not supported on polymorph without discriminator'); |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | * |
| 40 | 40 | * @param string $type |
| 41 | 41 | */ |
| 42 | - public function declare(string $type): void |
|
| 42 | + public function declare(string$type): void |
|
| 43 | 43 | { |
| 44 | 44 | if (isset($this->declaredTypes[$type])) { |
| 45 | 45 | return; |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | |
| 65 | 65 | // Replace 'adapter' with 'driver' and add 'pdo_' |
| 66 | 66 | if (isset($parameters['adapter'])) { |
| 67 | - $parameters['driver'] = 'pdo_' . $parameters['adapter']; |
|
| 67 | + $parameters['driver'] = 'pdo_'.$parameters['adapter']; |
|
| 68 | 68 | unset($parameters['adapter']); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -44,8 +44,8 @@ |
||
| 44 | 44 | { |
| 45 | 45 | if ($this->cacheKey === null) { |
| 46 | 46 | $this->cacheKey = new CacheKey( |
| 47 | - function () { return $this->cacheNamespace(); }, |
|
| 48 | - $key ?? function () { return $this->cacheKey(); }, |
|
| 47 | + function() { return $this->cacheNamespace(); }, |
|
| 48 | + $key ?? function() { return $this->cacheKey(); }, |
|
| 49 | 49 | $lifetime |
| 50 | 50 | ); |
| 51 | 51 | |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | $count = 0; |
| 109 | 109 | |
| 110 | 110 | foreach ($this->execute() as $result) { |
| 111 | - $count += (int)$result['aggregate']; |
|
| 111 | + $count += (int) $result['aggregate']; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | $this->compilerState->invalidate(['columns', 'orders']); |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | #[ReadOperation] |
| 124 | 124 | public function count($column = null) |
| 125 | 125 | { |
| 126 | - return (int)array_sum($this->aggregate(__FUNCTION__, $column)); |
|
| 126 | + return (int) array_sum($this->aggregate(__FUNCTION__, $column)); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | /** |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | { |
| 135 | 135 | $numbers = $this->aggregate(__FUNCTION__, $column); |
| 136 | 136 | |
| 137 | - return array_sum($numbers)/count($numbers); |
|
| 137 | + return array_sum($numbers) / count($numbers); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | /** |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | #[ReadOperation] |
| 144 | 144 | public function min($column = null) |
| 145 | 145 | { |
| 146 | - return (float)min($this->aggregate(__FUNCTION__, $column)); |
|
| 146 | + return (float) min($this->aggregate(__FUNCTION__, $column)); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | /** |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | #[ReadOperation] |
| 153 | 153 | public function max($column = null) |
| 154 | 154 | { |
| 155 | - return (float)max($this->aggregate(__FUNCTION__, $column)); |
|
| 155 | + return (float) max($this->aggregate(__FUNCTION__, $column)); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | /** |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | #[ReadOperation] |
| 162 | 162 | public function sum($column = null) |
| 163 | 163 | { |
| 164 | - return (float)array_sum($this->aggregate(__FUNCTION__, $column)); |
|
| 164 | + return (float) array_sum($this->aggregate(__FUNCTION__, $column)); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | #[WriteOperation] |
| 154 | 154 | public function saveAll($relations = []) |
| 155 | 155 | { |
| 156 | - return $this->relation->saveAll($this->owner, (array)$relations); |
|
| 156 | + return $this->relation->saveAll($this->owner, (array) $relations); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | /** |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | #[WriteOperation] |
| 168 | 168 | public function deleteAll($relations = []) |
| 169 | 169 | { |
| 170 | - return $this->relation->deleteAll($this->owner, (array)$relations); |
|
| 170 | + return $this->relation->deleteAll($this->owner, (array) $relations); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | /** |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | */ |
| 143 | 143 | public function ignore($flag = true) |
| 144 | 144 | { |
| 145 | - $this->statements['ignore'] = (bool)$flag; |
|
| 145 | + $this->statements['ignore'] = (bool) $flag; |
|
| 146 | 146 | |
| 147 | 147 | return $this; |
| 148 | 148 | } |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | $this->statements['offset'] = null; |
| 267 | 267 | $this->statements['aggregate'] = ['pagination', $this->getPaginationColumns($columns)]; |
| 268 | 268 | |
| 269 | - $count = (int)$this->execute()[0]['aggregate']; |
|
| 269 | + $count = (int) $this->execute()[0]['aggregate']; |
|
| 270 | 270 | |
| 271 | 271 | $this->compilerState->invalidate(['columns', 'orders']); |
| 272 | 272 | $this->statements = $statements; |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | #[ReadOperation] |
| 312 | 312 | public function count($column = null) |
| 313 | 313 | { |
| 314 | - return (int)$this->aggregate(__FUNCTION__, $column); |
|
| 314 | + return (int) $this->aggregate(__FUNCTION__, $column); |
|
| 315 | 315 | } |
| 316 | 316 | |
| 317 | 317 | /** |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | #[ReadOperation] |
| 321 | 321 | public function avg($column = null) |
| 322 | 322 | { |
| 323 | - return (float)$this->aggregate(__FUNCTION__, $column); |
|
| 323 | + return (float) $this->aggregate(__FUNCTION__, $column); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | /** |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | #[ReadOperation] |
| 330 | 330 | public function min($column = null) |
| 331 | 331 | { |
| 332 | - return (float)$this->aggregate(__FUNCTION__, $column); |
|
| 332 | + return (float) $this->aggregate(__FUNCTION__, $column); |
|
| 333 | 333 | } |
| 334 | 334 | |
| 335 | 335 | /** |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | #[ReadOperation] |
| 339 | 339 | public function max($column = null) |
| 340 | 340 | { |
| 341 | - return (float)$this->aggregate(__FUNCTION__, $column); |
|
| 341 | + return (float) $this->aggregate(__FUNCTION__, $column); |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | /** |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | #[ReadOperation] |
| 348 | 348 | public function sum($column = null) |
| 349 | 349 | { |
| 350 | - return (float)$this->aggregate(__FUNCTION__, $column); |
|
| 350 | + return (float) $this->aggregate(__FUNCTION__, $column); |
|
| 351 | 351 | } |
| 352 | 352 | |
| 353 | 353 | /** |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | { |
| 378 | 378 | $this->compilerState->invalidate('columns'); |
| 379 | 379 | |
| 380 | - $this->statements['distinct'] = (bool)$flag; |
|
| 380 | + $this->statements['distinct'] = (bool) $flag; |
|
| 381 | 381 | |
| 382 | 382 | return $this; |
| 383 | 383 | } |
@@ -562,7 +562,7 @@ discard block |
||
| 562 | 562 | # build a regular expression for each parameter |
| 563 | 563 | foreach ($values as $key => $value) { |
| 564 | 564 | if (is_string($key)) { |
| 565 | - $keys[] = '/:' . $key . '/'; |
|
| 565 | + $keys[] = '/:'.$key.'/'; |
|
| 566 | 566 | } else { |
| 567 | 567 | $keys[] = '/[?]/'; |
| 568 | 568 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | public function __construct(string $entityClass, string $message = '', ?Throwable $previous = null) |
| 26 | 26 | { |
| 27 | - parent::__construct($entityClass . ' : ' . $message, 0, $previous); |
|
| 27 | + parent::__construct($entityClass.' : '.$message, 0, $previous); |
|
| 28 | 28 | |
| 29 | 29 | $this->entityClass = $entityClass; |
| 30 | 30 | } |