@@ -60,8 +60,8 @@ discard block |
||
60 | 60 | $schema = $this->constant('SCHEMA')->getValue(); |
61 | 61 | $validates = $this->constant('VALIDATES')->getValue(); |
62 | 62 | |
63 | - if (!isset($this->mapping[$type])) { |
|
64 | - $schema[$field] = ($source ?? self::DEFAULT_SOURCE) . ':' . ($origin ?: $field); |
|
63 | + if (!isset($this->mapping[$type])){ |
|
64 | + $schema[$field] = ($source ?? self::DEFAULT_SOURCE).':'.($origin ?: $field); |
|
65 | 65 | |
66 | 66 | $this->constant('SCHEMA')->setValue($schema); |
67 | 67 | |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | |
73 | 73 | //Source can depend on type |
74 | 74 | $source = $source ?? $definition['source']; |
75 | - $schema[$field] = $source . ':' . ($origin ?: $field); |
|
75 | + $schema[$field] = $source.':'.($origin ?: $field); |
|
76 | 76 | |
77 | - if (!empty($definition['validates'])) { |
|
77 | + if (!empty($definition['validates'])){ |
|
78 | 78 | //Pre-defined validation |
79 | 79 | $validates[$field] = $definition['validates']; |
80 | 80 | } |
@@ -60,7 +60,8 @@ discard block |
||
60 | 60 | $schema = $this->constant('SCHEMA')->getValue(); |
61 | 61 | $validates = $this->constant('VALIDATES')->getValue(); |
62 | 62 | |
63 | - if (!isset($this->mapping[$type])) { |
|
63 | + if (!isset($this->mapping[$type])) |
|
64 | + { |
|
64 | 65 | $schema[$field] = ($source ?? self::DEFAULT_SOURCE) . ':' . ($origin ?: $field); |
65 | 66 | |
66 | 67 | $this->constant('SCHEMA')->setValue($schema); |
@@ -74,7 +75,8 @@ discard block |
||
74 | 75 | $source = $source ?? $definition['source']; |
75 | 76 | $schema[$field] = $source . ':' . ($origin ?: $field); |
76 | 77 | |
77 | - if (!empty($definition['validates'])) { |
|
78 | + if (!empty($definition['validates'])) |
|
79 | + { |
|
78 | 80 | //Pre-defined validation |
79 | 81 | $validates[$field] = $definition['validates']; |
80 | 82 | } |
@@ -51,7 +51,7 @@ |
||
51 | 51 | $source = $this->method('up')->getSource(); |
52 | 52 | |
53 | 53 | $source->addLine("\$this->table('{$table}')"); |
54 | - foreach ($columns as $name => $type) { |
|
54 | + foreach ($columns as $name => $type){ |
|
55 | 55 | $source->addLine(" ->addColumn('{$name}', '{$type}')"); |
56 | 56 | } |
57 | 57 |
@@ -51,7 +51,8 @@ |
||
51 | 51 | $source = $this->method('up')->getSource(); |
52 | 52 | |
53 | 53 | $source->addLine("\$this->table('{$table}')"); |
54 | - foreach ($columns as $name => $type) { |
|
54 | + foreach ($columns as $name => $type) |
|
55 | + { |
|
55 | 56 | $source->addLine(" ->addColumn('{$name}', '{$type}')"); |
56 | 57 | } |
57 | 58 |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function getAnnotation($value): string |
39 | 39 | { |
40 | - if (is_array($value)) { |
|
40 | + if (is_array($value)){ |
|
41 | 41 | return $this->arrayAnnotationString($value); |
42 | 42 | } |
43 | 43 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | private function arrayAnnotationString(array $value): string |
61 | 61 | { |
62 | 62 | $types = []; |
63 | - foreach ($value as $item) { |
|
63 | + foreach ($value as $item){ |
|
64 | 64 | $types[] = gettype($item); |
65 | 65 | } |
66 | 66 | $types = array_unique($types); |
@@ -37,7 +37,8 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function getAnnotation($value): string |
39 | 39 | { |
40 | - if (is_array($value)) { |
|
40 | + if (is_array($value)) |
|
41 | + { |
|
41 | 42 | return $this->arrayAnnotationString($value); |
42 | 43 | } |
43 | 44 | |
@@ -60,7 +61,8 @@ discard block |
||
60 | 61 | private function arrayAnnotationString(array $value): string |
61 | 62 | { |
62 | 63 | $types = []; |
63 | - foreach ($value as $item) { |
|
64 | + foreach ($value as $item) |
|
65 | + { |
|
64 | 66 | $types[] = gettype($item); |
65 | 67 | } |
66 | 68 | $types = array_unique($types); |
@@ -37,7 +37,7 @@ |
||
37 | 37 | public function get(array $values): array |
38 | 38 | { |
39 | 39 | $output = []; |
40 | - foreach ($values as $key => $value) { |
|
40 | + foreach ($values as $key => $value){ |
|
41 | 41 | $output[$key] = self::TYPE_DEFAULTS[gettype($value)] ?? null; |
42 | 42 | } |
43 | 43 |
@@ -37,7 +37,8 @@ |
||
37 | 37 | public function get(array $values): array |
38 | 38 | { |
39 | 39 | $output = []; |
40 | - foreach ($values as $key => $value) { |
|
40 | + foreach ($values as $key => $value) |
|
41 | + { |
|
41 | 42 | $output[$key] = self::TYPE_DEFAULTS[gettype($value)] ?? null; |
42 | 43 | } |
43 | 44 |
@@ -26,7 +26,7 @@ |
||
26 | 26 | public function setUp(): void |
27 | 27 | { |
28 | 28 | $this->app = TestApp::init([ |
29 | - 'root' => __DIR__ . '/App', |
|
29 | + 'root' => __DIR__.'/App', |
|
30 | 30 | ], null, false); |
31 | 31 | } |
32 | 32 | } |
@@ -115,17 +115,17 @@ discard block |
||
115 | 115 | ]; |
116 | 116 | |
117 | 117 | $reflectionMethods = []; |
118 | - foreach ($reflection->getMethods() as $method) { |
|
119 | - if ($method->getDeclaringClass()->name !== $reflection->name) { |
|
118 | + foreach ($reflection->getMethods() as $method){ |
|
119 | + if ($method->getDeclaringClass()->name !== $reflection->name){ |
|
120 | 120 | continue; |
121 | 121 | } |
122 | 122 | |
123 | 123 | $reflectionMethods[$method->name] = $method; |
124 | 124 | $this->assertArrayHasKey($method->name, $methods); |
125 | 125 | |
126 | - if (!$method->hasReturnType()) { |
|
126 | + if (!$method->hasReturnType()){ |
|
127 | 127 | $this->assertNull($methods[$method->name]['hint']); |
128 | - } else { |
|
128 | + }else{ |
|
129 | 129 | $this->assertEquals($methods[$method->name]['hint'], $method->getReturnType()->getName()); |
130 | 130 | } |
131 | 131 | |
@@ -169,8 +169,8 @@ discard block |
||
169 | 169 | ]; |
170 | 170 | |
171 | 171 | $reflectionMethods = []; |
172 | - foreach ($reflection->getMethods() as $method) { |
|
173 | - if ($method->getDeclaringClass()->name !== $reflection->name) { |
|
172 | + foreach ($reflection->getMethods() as $method){ |
|
173 | + if ($method->getDeclaringClass()->name !== $reflection->name){ |
|
174 | 174 | continue; |
175 | 175 | } |
176 | 176 | $reflectionMethods[$method->name] = $method; |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | |
240 | 240 | clearstatcache(); |
241 | 241 | |
242 | - $filename = $this->app->directory('config') . "$name.php"; |
|
242 | + $filename = $this->app->directory('config')."$name.php"; |
|
243 | 243 | $this->assertFileExists($filename); |
244 | 244 | |
245 | 245 | return $filename; |
@@ -115,17 +115,22 @@ discard block |
||
115 | 115 | ]; |
116 | 116 | |
117 | 117 | $reflectionMethods = []; |
118 | - foreach ($reflection->getMethods() as $method) { |
|
119 | - if ($method->getDeclaringClass()->name !== $reflection->name) { |
|
118 | + foreach ($reflection->getMethods() as $method) |
|
119 | + { |
|
120 | + if ($method->getDeclaringClass()->name !== $reflection->name) |
|
121 | + { |
|
120 | 122 | continue; |
121 | 123 | } |
122 | 124 | |
123 | 125 | $reflectionMethods[$method->name] = $method; |
124 | 126 | $this->assertArrayHasKey($method->name, $methods); |
125 | 127 | |
126 | - if (!$method->hasReturnType()) { |
|
128 | + if (!$method->hasReturnType()) |
|
129 | + { |
|
127 | 130 | $this->assertNull($methods[$method->name]['hint']); |
128 | - } else { |
|
131 | + } |
|
132 | + else |
|
133 | + { |
|
129 | 134 | $this->assertEquals($methods[$method->name]['hint'], $method->getReturnType()->getName()); |
130 | 135 | } |
131 | 136 | |
@@ -169,8 +174,10 @@ discard block |
||
169 | 174 | ]; |
170 | 175 | |
171 | 176 | $reflectionMethods = []; |
172 | - foreach ($reflection->getMethods() as $method) { |
|
173 | - if ($method->getDeclaringClass()->name !== $reflection->name) { |
|
177 | + foreach ($reflection->getMethods() as $method) |
|
178 | + { |
|
179 | + if ($method->getDeclaringClass()->name !== $reflection->name) |
|
180 | + { |
|
174 | 181 | continue; |
175 | 182 | } |
176 | 183 | $reflectionMethods[$method->name] = $method; |
@@ -33,7 +33,7 @@ |
||
33 | 33 | 'alias' => $alias, |
34 | 34 | '--description' => 'My sample command description', |
35 | 35 | ]; |
36 | - if ($alias === null) { |
|
36 | + if ($alias === null){ |
|
37 | 37 | unset($input['alias']); |
38 | 38 | } |
39 | 39 |
@@ -33,7 +33,8 @@ |
||
33 | 33 | 'alias' => $alias, |
34 | 34 | '--description' => 'My sample command description', |
35 | 35 | ]; |
36 | - if ($alias === null) { |
|
36 | + if ($alias === null) |
|
37 | + { |
|
37 | 38 | unset($input['alias']); |
38 | 39 | } |
39 | 40 |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $line = __LINE__; |
92 | 92 | $className = "\\Spiral\\Tests\\Scaffolder\\App\\Request\\Sample{$line}Request"; |
93 | 93 | $output = $this->console()->run('create:filter', [ |
94 | - 'name' => 'sample' . $line, |
|
94 | + 'name' => 'sample'.$line, |
|
95 | 95 | '--entity' => SourceEntity::class |
96 | 96 | ]); |
97 | 97 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | |
103 | 103 | $reflection = new ReflectionClass($className); |
104 | 104 | |
105 | - try { |
|
105 | + try{ |
|
106 | 106 | $schema = $reflection->getConstant('SCHEMA'); |
107 | 107 | $this->assertSame('data:noTypeString', $schema['noTypeString']); |
108 | 108 | $this->assertSame('data:obj', $schema['obj']); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $this->assertSame(['notEmpty', 'string'], $validates['obj']); |
115 | 115 | $this->assertSame(['notEmpty', 'integer'], $validates['intFromPhpDoc']); |
116 | 116 | $this->assertSame(['notEmpty', 'float'], $validates['noTypeWithFloatDefault']); |
117 | - } finally { |
|
117 | + }finally{ |
|
118 | 118 | $this->deleteDeclaration($className); |
119 | 119 | } |
120 | 120 | } |
@@ -102,7 +102,8 @@ discard block |
||
102 | 102 | |
103 | 103 | $reflection = new ReflectionClass($className); |
104 | 104 | |
105 | - try { |
|
105 | + try |
|
106 | + { |
|
106 | 107 | $schema = $reflection->getConstant('SCHEMA'); |
107 | 108 | $this->assertSame('data:noTypeString', $schema['noTypeString']); |
108 | 109 | $this->assertSame('data:obj', $schema['obj']); |
@@ -114,7 +115,9 @@ discard block |
||
114 | 115 | $this->assertSame(['notEmpty', 'string'], $validates['obj']); |
115 | 116 | $this->assertSame(['notEmpty', 'integer'], $validates['intFromPhpDoc']); |
116 | 117 | $this->assertSame(['notEmpty', 'float'], $validates['noTypeWithFloatDefault']); |
117 | - } finally { |
|
118 | + } |
|
119 | + finally |
|
120 | + { |
|
118 | 121 | $this->deleteDeclaration($className); |
119 | 122 | } |
120 | 123 | } |
@@ -89,7 +89,7 @@ |
||
89 | 89 | public function testFromEntity(): void |
90 | 90 | { |
91 | 91 | $line = __LINE__; |
92 | - $className = "\\Spiral\\Tests\\Scaffolder\\App\\Request\\Sample{$line}Request"; |
|
92 | + $className = "\\Spiral\\Tests\\Scaffolder\\App\\Request\\Sample{$line}request"; |
|
93 | 93 | $output = $this->console()->run('create:filter', [ |
94 | 94 | 'name' => 'sample' . $line, |
95 | 95 | '--entity' => SourceEntity::class |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | */ |
28 | 28 | public function tearDown(): void |
29 | 29 | { |
30 | - $this->files()->deleteDirectory($this->app->directory('app') . 'migrations', true); |
|
30 | + $this->files()->deleteDirectory($this->app->directory('app').'migrations', true); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | clearstatcache(); |
42 | 42 | |
43 | - foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) { |
|
43 | + foreach ($this->files()->getFiles($this->app->directory('app').'migrations') as $file){ |
|
44 | 44 | require_once $file; |
45 | 45 | } |
46 | 46 | |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | |
64 | 64 | clearstatcache(); |
65 | 65 | |
66 | - foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) { |
|
66 | + foreach ($this->files()->getFiles($this->app->directory('app').'migrations') as $file){ |
|
67 | 67 | require_once $file; |
68 | 68 | } |
69 | 69 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $this->console()->run('create:migration', [ |
83 | 83 | 'name' => 'sample3', |
84 | 84 | '--table' => 'sample3_table', |
85 | - '--field' => ['id',] |
|
85 | + '--field' => ['id', ] |
|
86 | 86 | ]); |
87 | 87 | } |
88 | 88 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | ] |
97 | 97 | ]; |
98 | 98 | |
99 | - if ($withTable) { |
|
99 | + if ($withTable){ |
|
100 | 100 | $input['--table'] = 'sample_table'; |
101 | 101 | } |
102 | 102 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | { |
114 | 114 | clearstatcache(); |
115 | 115 | |
116 | - foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) { |
|
116 | + foreach ($this->files()->getFiles($this->app->directory('app').'migrations') as $file){ |
|
117 | 117 | require_once $file; |
118 | 118 | } |
119 | 119 |
@@ -40,7 +40,8 @@ discard block |
||
40 | 40 | |
41 | 41 | clearstatcache(); |
42 | 42 | |
43 | - foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) { |
|
43 | + foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) |
|
44 | + { |
|
44 | 45 | require_once $file; |
45 | 46 | } |
46 | 47 | |
@@ -63,7 +64,8 @@ discard block |
||
63 | 64 | |
64 | 65 | clearstatcache(); |
65 | 66 | |
66 | - foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) { |
|
67 | + foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) |
|
68 | + { |
|
67 | 69 | require_once $file; |
68 | 70 | } |
69 | 71 | |
@@ -96,7 +98,8 @@ discard block |
||
96 | 98 | ] |
97 | 99 | ]; |
98 | 100 | |
99 | - if ($withTable) { |
|
101 | + if ($withTable) |
|
102 | + { |
|
100 | 103 | $input['--table'] = 'sample_table'; |
101 | 104 | } |
102 | 105 | |
@@ -113,7 +116,8 @@ discard block |
||
113 | 116 | { |
114 | 117 | clearstatcache(); |
115 | 118 | |
116 | - foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) { |
|
119 | + foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) |
|
120 | + { |
|
117 | 121 | require_once $file; |
118 | 122 | } |
119 | 123 |