@@ -62,9 +62,12 @@ |
||
| 62 | 62 | $console->addCommand(Command\MiddlewareCommand::class); |
| 63 | 63 | $console->addCommand(Command\MigrationCommand::class); |
| 64 | 64 | |
| 65 | - try { |
|
| 65 | + try |
|
| 66 | + { |
|
| 66 | 67 | $defaultNamespace = (new ReflectionClass($this->kernel))->getNamespaceName(); |
| 67 | - } catch (ReflectionException $e) { |
|
| 68 | + } |
|
| 69 | + catch (ReflectionException $e) |
|
| 70 | + { |
|
| 68 | 71 | $defaultNamespace = ''; |
| 69 | 72 | } |
| 70 | 73 | |
@@ -54,11 +54,13 @@ |
||
| 54 | 54 | /** @var ControllerDeclaration $declaration */ |
| 55 | 55 | $declaration = $this->createDeclaration(); |
| 56 | 56 | |
| 57 | - foreach ($this->option('action') as $action) { |
|
| 57 | + foreach ($this->option('action') as $action) |
|
| 58 | + { |
|
| 58 | 59 | $declaration->addAction($action); |
| 59 | 60 | } |
| 60 | 61 | |
| 61 | - if ((bool)$this->option('prototype')) { |
|
| 62 | + if ((bool)$this->option('prototype')) |
|
| 63 | + { |
|
| 62 | 64 | $declaration->addPrototypeTrait(); |
| 63 | 65 | } |
| 64 | 66 | |
@@ -60,10 +60,13 @@ |
||
| 60 | 60 | /** @var MigrationDeclaration $declaration */ |
| 61 | 61 | $declaration = $this->createDeclaration(); |
| 62 | 62 | |
| 63 | - if (!empty($this->option('table'))) { |
|
| 63 | + if (!empty($this->option('table'))) |
|
| 64 | + { |
|
| 64 | 65 | $fields = []; |
| 65 | - foreach ($this->option('field') as $field) { |
|
| 66 | - if (strpos($field, ':') === false) { |
|
| 66 | + foreach ($this->option('field') as $field) |
|
| 67 | + { |
|
| 68 | + if (strpos($field, ':') === false) |
|
| 69 | + { |
|
| 67 | 70 | throw new ScaffolderException("Field definition must in 'name:type' form"); |
| 68 | 71 | } |
| 69 | 72 | |
@@ -108,7 +108,8 @@ discard block |
||
| 108 | 108 | $declaration = $this->createDeclaration(); |
| 109 | 109 | |
| 110 | 110 | $repository = trimPostfix((string)$this->argument('name'), 'repository'); |
| 111 | - if ($this->option('repository')) { |
|
| 111 | + if ($this->option('repository')) |
|
| 112 | + { |
|
| 112 | 113 | $repositoryClass = $config->className(RepositoryCommand::ELEMENT, $repository); |
| 113 | 114 | $repositoryNamespace = $config->classNamespace(RepositoryCommand::ELEMENT, $repository); |
| 114 | 115 | $declaration->setRepository("\\$repositoryNamespace\\$repositoryClass"); |
@@ -120,8 +121,10 @@ discard block |
||
| 120 | 121 | $declaration->setDatabase((string)$this->option('database')); |
| 121 | 122 | $declaration->setInflection((string)$this->option('inflection')); |
| 122 | 123 | |
| 123 | - foreach ($this->option('field') as $field) { |
|
| 124 | - if (strpos($field, ':') === false) { |
|
| 124 | + foreach ($this->option('field') as $field) |
|
| 125 | + { |
|
| 126 | + if (strpos($field, ':') === false) |
|
| 127 | + { |
|
| 125 | 128 | throw new ScaffolderException("Field definition must in 'name:type' or 'name:type' form"); |
| 126 | 129 | } |
| 127 | 130 | |
@@ -135,7 +138,8 @@ discard block |
||
| 135 | 138 | |
| 136 | 139 | $this->writeDeclaration($declaration); |
| 137 | 140 | |
| 138 | - if ($this->option('repository')) { |
|
| 141 | + if ($this->option('repository')) |
|
| 142 | + { |
|
| 139 | 143 | $console->run('create:repository', [ |
| 140 | 144 | 'name' => $repository ?? $this->argument('name') |
| 141 | 145 | ]); |
@@ -110,7 +110,8 @@ |
||
| 110 | 110 | $filename = $this->config->classFilename($type, (string)$this->argument('name')); |
| 111 | 111 | $filename = $this->files->normalizePath($filename); |
| 112 | 112 | |
| 113 | - if ($this->files->exists($filename)) { |
|
| 113 | + if ($this->files->exists($filename)) |
|
| 114 | + { |
|
| 114 | 115 | $this->writeln( |
| 115 | 116 | "<fg=red>Unable to create '<comment>{$declaration->getName()}</comment>' declaration, " |
| 116 | 117 | . "file '<comment>{$filename}</comment>' already exists.</fg=red>" |
@@ -63,11 +63,15 @@ discard block |
||
| 63 | 63 | $declaration = $this->createDeclaration(); |
| 64 | 64 | |
| 65 | 65 | $fields = []; |
| 66 | - if ($this->option('entity')) { |
|
| 66 | + if ($this->option('entity')) |
|
| 67 | + { |
|
| 67 | 68 | $name = $this->option('entity'); |
| 68 | - try { |
|
| 69 | + try |
|
| 70 | + { |
|
| 69 | 71 | $fields = $this->parseSourceEntity($name); |
| 70 | - } catch (ReflectionException $e) { |
|
| 72 | + } |
|
| 73 | + catch (ReflectionException $e) |
|
| 74 | + { |
|
| 71 | 75 | $this->writeln( |
| 72 | 76 | "<fg=red>Unable to create '<comment>{$declaration->getName()} from $name</comment>' declaration: " |
| 73 | 77 | . "'<comment>{$e->getMessage()}' at {$e->getFile()}:{$e->getLine()}.</comment></fg=red>" |
@@ -75,13 +79,17 @@ discard block |
||
| 75 | 79 | |
| 76 | 80 | return; |
| 77 | 81 | } |
| 78 | - } else { |
|
| 79 | - foreach ($this->option('field') as $field) { |
|
| 82 | + } |
|
| 83 | + else |
|
| 84 | + { |
|
| 85 | + foreach ($this->option('field') as $field) |
|
| 86 | + { |
|
| 80 | 87 | $fields[] = $this->parseField($field); |
| 81 | 88 | } |
| 82 | 89 | } |
| 83 | 90 | |
| 84 | - foreach ($fields as $values) { |
|
| 91 | + foreach ($fields as $values) |
|
| 92 | + { |
|
| 85 | 93 | [$field, $type, $source, $origin] = $values; |
| 86 | 94 | |
| 87 | 95 | $declaration->declareField($field, $type, $source, $origin); |
@@ -102,16 +110,19 @@ discard block |
||
| 102 | 110 | $source = null; |
| 103 | 111 | $origin = null; |
| 104 | 112 | |
| 105 | - if (strpos($field, '(') !== false) { |
|
| 113 | + if (strpos($field, '(') !== false) |
|
| 114 | + { |
|
| 106 | 115 | $source = substr($field, strpos($field, '(') + 1, -1); |
| 107 | 116 | $field = substr($field, 0, strpos($field, '(')); |
| 108 | 117 | |
| 109 | - if (strpos($source, ':') !== false) { |
|
| 118 | + if (strpos($source, ':') !== false) |
|
| 119 | + { |
|
| 110 | 120 | [$source, $origin] = explode(':', $source); |
| 111 | 121 | } |
| 112 | 122 | } |
| 113 | 123 | |
| 114 | - if (strpos($field, ':') !== false) { |
|
| 124 | + if (strpos($field, ':') !== false) |
|
| 125 | + { |
|
| 115 | 126 | [$field, $type] = explode(':', $field); |
| 116 | 127 | } |
| 117 | 128 | |
@@ -127,7 +138,8 @@ discard block |
||
| 127 | 138 | { |
| 128 | 139 | $fields = []; |
| 129 | 140 | $reflection = new ReflectionClass($name); |
| 130 | - foreach ($reflection->getProperties() as $property) { |
|
| 141 | + foreach ($reflection->getProperties() as $property) |
|
| 142 | + { |
|
| 131 | 143 | $type = $this->getTypedPropertyType($property) |
| 132 | 144 | ?? $this->getPropertyTypeFromDefaults($property, $reflection) |
| 133 | 145 | ?? $this->getPropertyTypeFromDocBlock($property); |
@@ -144,10 +156,12 @@ discard block |
||
| 144 | 156 | */ |
| 145 | 157 | private function getTypedPropertyType(ReflectionProperty $property): ?string |
| 146 | 158 | { |
| 147 | - if (method_exists($property, 'hasType') && method_exists($property, 'getType') && $property->hasType()) { |
|
| 159 | + if (method_exists($property, 'hasType') && method_exists($property, 'getType') && $property->hasType()) |
|
| 160 | + { |
|
| 148 | 161 | /** @var ReflectionType $type */ |
| 149 | 162 | $type = $property->getType(); |
| 150 | - if (method_exists($type, 'getName') && $this->isKnownType($type->getName())) { |
|
| 163 | + if (method_exists($type, 'getName') && $this->isKnownType($type->getName())) |
|
| 164 | + { |
|
| 151 | 165 | return $type->getName(); |
| 152 | 166 | } |
| 153 | 167 | } |
@@ -162,7 +176,8 @@ discard block |
||
| 162 | 176 | */ |
| 163 | 177 | private function getPropertyTypeFromDefaults(ReflectionProperty $property, ReflectionClass $reflection): ?string |
| 164 | 178 | { |
| 165 | - if (!isset($reflection->getDefaultProperties()[$property->name])) { |
|
| 179 | + if (!isset($reflection->getDefaultProperties()[$property->name])) |
|
| 180 | + { |
|
| 166 | 181 | return null; |
| 167 | 182 | } |
| 168 | 183 | |
@@ -178,9 +193,11 @@ discard block |
||
| 178 | 193 | private function getPropertyTypeFromDocBlock(ReflectionProperty $property): ?string |
| 179 | 194 | { |
| 180 | 195 | $doc = $property->getDocComment(); |
| 181 | - if (is_string($doc)) { |
|
| 196 | + if (is_string($doc)) |
|
| 197 | + { |
|
| 182 | 198 | preg_match('/@var\s*([\S]+)/i', $doc, $match); |
| 183 | - if (!empty($match[1]) && $this->isKnownType($match[1])) { |
|
| 199 | + if (!empty($match[1]) && $this->isKnownType($match[1])) |
|
| 200 | + { |
|
| 184 | 201 | return $match[1]; |
| 185 | 202 | } |
| 186 | 203 | } |
@@ -69,11 +69,13 @@ discard block |
||
| 69 | 69 | $localNamespace = trim($this->getOption($element, 'namespace', ''), '\\'); |
| 70 | 70 | ['namespace' => $namespace] = $this->parseName($name); |
| 71 | 71 | |
| 72 | - if (!empty($namespace)) { |
|
| 72 | + if (!empty($namespace)) |
|
| 73 | + { |
|
| 73 | 74 | $localNamespace .= '\\' . $this->classify($namespace); |
| 74 | 75 | } |
| 75 | 76 | |
| 76 | - if (empty($this->baseNamespace())) { |
|
| 77 | + if (empty($this->baseNamespace())) |
|
| 78 | + { |
|
| 77 | 79 | return $localNamespace; |
| 78 | 80 | } |
| 79 | 81 | |
@@ -106,7 +108,8 @@ discard block |
||
| 106 | 108 | { |
| 107 | 109 | $class = $this->getOption($element, 'class'); |
| 108 | 110 | |
| 109 | - if (empty($class)) { |
|
| 111 | + if (empty($class)) |
|
| 112 | + { |
|
| 110 | 113 | throw new ScaffolderException( |
| 111 | 114 | "Unable to scaffold '{$element}', no declaration class found" |
| 112 | 115 | ); |
@@ -143,11 +146,13 @@ discard block |
||
| 143 | 146 | */ |
| 144 | 147 | private function getOption(string $element, string $section, $default = null) |
| 145 | 148 | { |
| 146 | - if (!isset($this->config['declarations'][$element])) { |
|
| 149 | + if (!isset($this->config['declarations'][$element])) |
|
| 150 | + { |
|
| 147 | 151 | throw new ScaffolderException("Undefined declaration '{$element}'."); |
| 148 | 152 | } |
| 149 | 153 | |
| 150 | - if (array_key_exists($section, $this->config['declarations'][$element])) { |
|
| 154 | + if (array_key_exists($section, $this->config['declarations'][$element])) |
|
| 155 | + { |
|
| 151 | 156 | return $this->config['declarations'][$element][$section]; |
| 152 | 157 | } |
| 153 | 158 | |
@@ -164,7 +169,8 @@ discard block |
||
| 164 | 169 | { |
| 165 | 170 | $name = str_replace('/', '\\', $name); |
| 166 | 171 | |
| 167 | - if (strpos($name, '\\') !== false) { |
|
| 172 | + if (strpos($name, '\\') !== false) |
|
| 173 | + { |
|
| 168 | 174 | $names = explode('\\', $name); |
| 169 | 175 | $class = array_pop($names); |
| 170 | 176 | |
@@ -192,11 +198,15 @@ discard block |
||
| 192 | 198 | { |
| 193 | 199 | $firstChunkIterated = false; |
| 194 | 200 | $joinedPath = ''; |
| 195 | - foreach ($chunks as $chunk) { |
|
| 196 | - if (!$firstChunkIterated) { |
|
| 201 | + foreach ($chunks as $chunk) |
|
| 202 | + { |
|
| 203 | + if (!$firstChunkIterated) |
|
| 204 | + { |
|
| 197 | 205 | $firstChunkIterated = true; |
| 198 | 206 | $joinedPath = $chunk; |
| 199 | - } else { |
|
| 207 | + } |
|
| 208 | + else |
|
| 209 | + { |
|
| 200 | 210 | $joinedPath = rtrim($joinedPath, $joint) . $joint . ltrim($chunk, $joint); |
| 201 | 211 | } |
| 202 | 212 | } |
@@ -11,7 +11,8 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | namespace Spiral\Scaffolder; |
| 13 | 13 | |
| 14 | -if (!function_exists('trimPostfix')) { |
|
| 14 | +if (!function_exists('trimPostfix')) |
|
| 15 | +{ |
|
| 15 | 16 | /** |
| 16 | 17 | * @param string $name |
| 17 | 18 | * @param string $postfix |
@@ -25,7 +26,8 @@ discard block |
||
| 25 | 26 | } |
| 26 | 27 | } |
| 27 | 28 | |
| 28 | -if (!function_exists('isAssociativeArray')) { |
|
| 29 | +if (!function_exists('isAssociativeArray')) |
|
| 30 | +{ |
|
| 29 | 31 | /** |
| 30 | 32 | * @param array $array |
| 31 | 33 | * @return bool |
@@ -33,12 +35,15 @@ discard block |
||
| 33 | 35 | function isAssociativeArray(array $array): bool |
| 34 | 36 | { |
| 35 | 37 | $keys = []; |
| 36 | - foreach ($array as $key => $value) { |
|
| 37 | - if (!is_int($key)) { |
|
| 38 | + foreach ($array as $key => $value) |
|
| 39 | + { |
|
| 40 | + if (!is_int($key)) |
|
| 41 | + { |
|
| 38 | 42 | return true; |
| 39 | 43 | } |
| 40 | 44 | |
| 41 | - if ($key !== count($keys)) { |
|
| 45 | + if ($key !== count($keys)) |
|
| 46 | + { |
|
| 42 | 47 | return true; |
| 43 | 48 | } |
| 44 | 49 | |
@@ -49,7 +54,8 @@ discard block |
||
| 49 | 54 | } |
| 50 | 55 | } |
| 51 | 56 | |
| 52 | -if (!function_exists('defineArrayType')) { |
|
| 57 | +if (!function_exists('defineArrayType')) |
|
| 58 | +{ |
|
| 53 | 59 | /** |
| 54 | 60 | * @param array $array |
| 55 | 61 | * @param string $failureType |
@@ -42,8 +42,10 @@ discard block |
||
| 42 | 42 | { |
| 43 | 43 | $entities = []; |
| 44 | 44 | $attributes = ['role', 'mapper', 'repository', 'table', 'database']; |
| 45 | - foreach ($attributes as $attribute) { |
|
| 46 | - if (!empty($this->$attribute)) { |
|
| 45 | + foreach ($attributes as $attribute) |
|
| 46 | + { |
|
| 47 | + if (!empty($this->$attribute)) |
|
| 48 | + { |
|
| 47 | 49 | $entities[] = "$attribute=\"{$this->$attribute}\""; |
| 48 | 50 | } |
| 49 | 51 | } |
@@ -69,12 +71,14 @@ discard block |
||
| 69 | 71 | private function makeFieldComment(string $name, string $type): string |
| 70 | 72 | { |
| 71 | 73 | $columns = []; |
| 72 | - if ($this->isNullableType($type)) { |
|
| 74 | + if ($this->isNullableType($type)) |
|
| 75 | + { |
|
| 73 | 76 | $columns = ['nullable = true']; |
| 74 | 77 | } |
| 75 | 78 | $columns[] = "type = \"{$this->annotatedType($type)}\""; |
| 76 | 79 | |
| 77 | - if (!empty($this->inflection)) { |
|
| 80 | + if (!empty($this->inflection)) |
|
| 81 | + { |
|
| 78 | 82 | $columns = $this->addInflectedName($this->inflection, $name, $columns); |
| 79 | 83 | } |
| 80 | 84 | |
@@ -101,7 +105,8 @@ discard block |
||
| 101 | 105 | private function addInflectedName(string $inflection, string $name, array $columns): array |
| 102 | 106 | { |
| 103 | 107 | $inflected = $this->inflect($inflection, $name); |
| 104 | - if ($inflected !== null && $inflected !== $name) { |
|
| 108 | + if ($inflected !== null && $inflected !== $name) |
|
| 109 | + { |
|
| 105 | 110 | $columns[] = "name = \"$inflected\""; |
| 106 | 111 | } |
| 107 | 112 | |
@@ -115,7 +120,8 @@ discard block |
||
| 115 | 120 | */ |
| 116 | 121 | private function inflect(string $inflection, string $value): ?string |
| 117 | 122 | { |
| 118 | - switch ($inflection) { |
|
| 123 | + switch ($inflection) |
|
| 124 | + { |
|
| 119 | 125 | case 'tableize': |
| 120 | 126 | case 't': |
| 121 | 127 | return $this->tableize($value); |