Completed
Push — master ( 6366df...fbe022 )
by Kirill
23s queued 19s
created
src/Scaffolder/src/Command/FilterCommand.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -63,11 +63,11 @@  discard block
 block discarded – undo
63 63
         $declaration = $this->createDeclaration();
64 64
 
65 65
         $fields = [];
66
-        if ($this->option('entity')) {
66
+        if ($this->option('entity')){
67 67
             $name = $this->option('entity');
68
-            try {
68
+            try{
69 69
                 $fields = $this->parseSourceEntity($name);
70
-            } catch (ReflectionException $e) {
70
+            }catch (ReflectionException $e){
71 71
                 $this->writeln(
72 72
                     "<fg=red>Unable to create '<comment>{$declaration->getName()} from $name</comment>' declaration: "
73 73
                     . "'<comment>{$e->getMessage()}' at {$e->getFile()}:{$e->getLine()}.</comment></fg=red>"
@@ -75,13 +75,13 @@  discard block
 block discarded – undo
75 75
 
76 76
                 return;
77 77
             }
78
-        } else {
79
-            foreach ($this->option('field') as $field) {
78
+        }else{
79
+            foreach ($this->option('field') as $field){
80 80
                 $fields[] = $this->parseField($field);
81 81
             }
82 82
         }
83 83
 
84
-        foreach ($fields as $values) {
84
+        foreach ($fields as $values){
85 85
             [$field, $type, $source, $origin] = $values;
86 86
 
87 87
             $declaration->declareField($field, $type, $source, $origin);
@@ -102,16 +102,16 @@  discard block
 block discarded – undo
102 102
         $source = null;
103 103
         $origin = null;
104 104
 
105
-        if (strpos($field, '(') !== false) {
105
+        if (strpos($field, '(') !== false){
106 106
             $source = substr($field, strpos($field, '(') + 1, -1);
107 107
             $field = substr($field, 0, strpos($field, '('));
108 108
 
109
-            if (strpos($source, ':') !== false) {
109
+            if (strpos($source, ':') !== false){
110 110
                 [$source, $origin] = explode(':', $source);
111 111
             }
112 112
         }
113 113
 
114
-        if (strpos($field, ':') !== false) {
114
+        if (strpos($field, ':') !== false){
115 115
             [$field, $type] = explode(':', $field);
116 116
         }
117 117
 
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
     {
128 128
         $fields = [];
129 129
         $reflection = new ReflectionClass($name);
130
-        foreach ($reflection->getProperties() as $property) {
130
+        foreach ($reflection->getProperties() as $property){
131 131
             $type = $this->getTypedPropertyType($property)
132 132
                 ?? $this->getPropertyTypeFromDefaults($property, $reflection)
133 133
                 ?? $this->getPropertyTypeFromDocBlock($property);
@@ -144,10 +144,10 @@  discard block
 block discarded – undo
144 144
      */
145 145
     private function getTypedPropertyType(ReflectionProperty $property): ?string
146 146
     {
147
-        if (method_exists($property, 'hasType') && method_exists($property, 'getType') && $property->hasType()) {
147
+        if (method_exists($property, 'hasType') && method_exists($property, 'getType') && $property->hasType()){
148 148
             /** @var ReflectionType $type */
149 149
             $type = $property->getType();
150
-            if (method_exists($type, 'getName') && $this->isKnownType($type->getName())) {
150
+            if (method_exists($type, 'getName') && $this->isKnownType($type->getName())){
151 151
                 return $type->getName();
152 152
             }
153 153
         }
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
      */
163 163
     private function getPropertyTypeFromDefaults(ReflectionProperty $property, ReflectionClass $reflection): ?string
164 164
     {
165
-        if (!isset($reflection->getDefaultProperties()[$property->name])) {
165
+        if (!isset($reflection->getDefaultProperties()[$property->name])){
166 166
             return null;
167 167
         }
168 168
 
@@ -178,9 +178,9 @@  discard block
 block discarded – undo
178 178
     private function getPropertyTypeFromDocBlock(ReflectionProperty $property): ?string
179 179
     {
180 180
         $doc = $property->getDocComment();
181
-        if (is_string($doc)) {
181
+        if (is_string($doc)){
182 182
             preg_match('/@var\s*([\S]+)/i', $doc, $match);
183
-            if (!empty($match[1]) && $this->isKnownType($match[1])) {
183
+            if (!empty($match[1]) && $this->isKnownType($match[1])){
184 184
                 return $match[1];
185 185
             }
186 186
         }
Please login to merge, or discard this patch.
Braces   +32 added lines, -15 removed lines patch added patch discarded remove patch
@@ -63,11 +63,15 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
src/Scaffolder/src/Config/ScaffolderConfig.php 2 patches
Braces   +19 added lines, -9 removed lines patch added patch discarded remove patch
@@ -69,11 +69,13 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     {
57 57
         ['name' => $name] = $this->parseName($name);
58 58
 
59
-        return $this->classify($name) . $this->elementPostfix($element);
59
+        return $this->classify($name).$this->elementPostfix($element);
60 60
     }
61 61
 
62 62
     /**
@@ -69,15 +69,15 @@  discard block
 block discarded – undo
69 69
         $localNamespace = trim($this->getOption($element, 'namespace', ''), '\\');
70 70
         ['namespace' => $namespace] = $this->parseName($name);
71 71
 
72
-        if (!empty($namespace)) {
73
-            $localNamespace .= '\\' . $this->classify($namespace);
72
+        if (!empty($namespace)){
73
+            $localNamespace .= '\\'.$this->classify($namespace);
74 74
         }
75 75
 
76
-        if (empty($this->baseNamespace())) {
76
+        if (empty($this->baseNamespace())){
77 77
             return $localNamespace;
78 78
         }
79 79
 
80
-        return trim($this->baseNamespace() . '\\' . $localNamespace, '\\');
80
+        return trim($this->baseNamespace().'\\'.$localNamespace, '\\');
81 81
     }
82 82
 
83 83
     /**
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         return $this->joinPathChunks([
94 94
             $this->baseDirectory(),
95 95
             str_replace('\\', '/', $namespace),
96
-            $this->className($element, $name) . '.php',
96
+            $this->className($element, $name).'.php',
97 97
         ], '/');
98 98
     }
99 99
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
     {
107 107
         $class = $this->getOption($element, 'class');
108 108
 
109
-        if (empty($class)) {
109
+        if (empty($class)){
110 110
             throw new ScaffolderException(
111 111
                 "Unable to scaffold '{$element}', no declaration class found"
112 112
             );
@@ -143,11 +143,11 @@  discard block
 block discarded – undo
143 143
      */
144 144
     private function getOption(string $element, string $section, $default = null)
145 145
     {
146
-        if (!isset($this->config['declarations'][$element])) {
146
+        if (!isset($this->config['declarations'][$element])){
147 147
             throw new ScaffolderException("Undefined declaration '{$element}'.");
148 148
         }
149 149
 
150
-        if (array_key_exists($section, $this->config['declarations'][$element])) {
150
+        if (array_key_exists($section, $this->config['declarations'][$element])){
151 151
             return $this->config['declarations'][$element][$section];
152 152
         }
153 153
 
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
     {
165 165
         $name = str_replace('/', '\\', $name);
166 166
 
167
-        if (strpos($name, '\\') !== false) {
167
+        if (strpos($name, '\\') !== false){
168 168
             $names = explode('\\', $name);
169 169
             $class = array_pop($names);
170 170
 
@@ -192,12 +192,12 @@  discard block
 block discarded – undo
192 192
     {
193 193
         $firstChunkIterated = false;
194 194
         $joinedPath = '';
195
-        foreach ($chunks as $chunk) {
196
-            if (!$firstChunkIterated) {
195
+        foreach ($chunks as $chunk){
196
+            if (!$firstChunkIterated){
197 197
                 $firstChunkIterated = true;
198 198
                 $joinedPath = $chunk;
199
-            } else {
200
-                $joinedPath = rtrim($joinedPath, $joint) . $joint . ltrim($chunk, $joint);
199
+            }else{
200
+                $joinedPath = rtrim($joinedPath, $joint).$joint.ltrim($chunk, $joint);
201 201
             }
202 202
         }
203 203
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
      */
211 211
     private function classify(string $name): string
212 212
     {
213
-        return ( new InflectorFactory() )
213
+        return (new InflectorFactory())
214 214
             ->build()
215 215
             ->classify($name);
216 216
     }
Please login to merge, or discard this patch.
src/Scaffolder/src/Declaration/Database/Entity/AnnotatedDeclaration.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
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
+            if (!empty($this->$attribute)){
47 47
                 $entities[] = "$attribute=\"{$this->$attribute}\"";
48 48
             }
49 49
         }
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
69 69
     private function makeFieldComment(string $name, string $type): string
70 70
     {
71 71
         $columns = [];
72
-        if ($this->isNullableType($type)) {
72
+        if ($this->isNullableType($type)){
73 73
             $columns = ['nullable = true'];
74 74
         }
75 75
         $columns[] = "type = \"{$this->annotatedType($type)}\"";
76 76
 
77
-        if (!empty($this->inflection)) {
77
+        if (!empty($this->inflection)){
78 78
             $columns = $this->addInflectedName($this->inflection, $name, $columns);
79 79
         }
80 80
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
     private function addInflectedName(string $inflection, string $name, array $columns): array
102 102
     {
103 103
         $inflected = $this->inflect($inflection, $name);
104
-        if ($inflected !== null && $inflected !== $name) {
104
+        if ($inflected !== null && $inflected !== $name){
105 105
             $columns[] = "name = \"$inflected\"";
106 106
         }
107 107
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
      */
116 116
     private function inflect(string $inflection, string $value): ?string
117 117
     {
118
-        switch ($inflection) {
118
+        switch ($inflection){
119 119
             case 'tableize':
120 120
             case 't':
121 121
                 return $this->tableize($value);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
      */
136 136
     private function tableize(string $name): string
137 137
     {
138
-        return ( new InflectorFactory() )
138
+        return (new InflectorFactory())
139 139
             ->build()
140 140
             ->tableize($name);
141 141
     }
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
      */
147 147
     private function camelize(string $name): string
148 148
     {
149
-        return ( new InflectorFactory() )
149
+        return (new InflectorFactory())
150 150
             ->build()
151 151
             ->camelize($name);
152 152
     }
Please login to merge, or discard this patch.
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -42,8 +42,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
src/Scaffolder/src/Declaration/Database/AbstractEntityDeclaration.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
     {
97 97
         $property = $this->property($name);
98 98
         $property->setComment("@var {$this->variableType($type)}");
99
-        if ($accessibility) {
99
+        if ($accessibility){
100 100
             $property->setAccess($accessibility);
101 101
         }
102 102
 
103
-        if ($property->getAccess() !== self::ACCESS_PUBLIC) {
103
+        if ($property->getAccess() !== self::ACCESS_PUBLIC){
104 104
             $this->declareAccessors($name, $type);
105 105
         }
106 106
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
      */
125 125
     private function variableType(string $type): string
126 126
     {
127
-        return $this->isNullableType($type) ? (substr($type, 1) . '|null') : $type;
127
+        return $this->isNullableType($type) ? (substr($type, 1).'|null') : $type;
128 128
     }
129 129
 
130 130
     /**
@@ -133,12 +133,12 @@  discard block
 block discarded – undo
133 133
      */
134 134
     private function declareAccessors(string $field, string $type): void
135 135
     {
136
-        $setter = $this->method('set' . $this->classify($field));
136
+        $setter = $this->method('set'.$this->classify($field));
137 137
         $setter->setPublic();
138 138
         $setter->parameter('value')->setType($type);
139 139
         $setter->setSource("\$this->$field = \$value;");
140 140
 
141
-        $getter = $this->method('get' . $this->classify($field));
141
+        $getter = $this->method('get'.$this->classify($field));
142 142
         $getter->setPublic();
143 143
         $getter->setSource("return \$this->$field;");
144 144
     }
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
      */
150 150
     private function classify(string $name): string
151 151
     {
152
-        return ( new InflectorFactory() )
152
+        return (new InflectorFactory())
153 153
             ->build()
154 154
             ->classify($name);
155 155
     }
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,11 +96,13 @@
 block discarded – undo
96 96
     {
97 97
         $property = $this->property($name);
98 98
         $property->setComment("@var {$this->variableType($type)}");
99
-        if ($accessibility) {
99
+        if ($accessibility)
100
+        {
100 101
             $property->setAccess($accessibility);
101 102
         }
102 103
 
103
-        if ($property->getAccess() !== self::ACCESS_PUBLIC) {
104
+        if ($property->getAccess() !== self::ACCESS_PUBLIC)
105
+        {
104 106
             $this->declareAccessors($name, $type);
105 107
         }
106 108
 
Please login to merge, or discard this patch.
src/Scaffolder/src/Declaration/ConfigDeclaration.php 2 patches
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
         string $name,
76 76
         string $comment = '',
77 77
         string $directory = ''
78
-    ) {
78
+    ){
79 79
         parent::__construct($name, 'InjectableConfig', [], $comment);
80 80
 
81 81
         $this->config = $config;
@@ -102,16 +102,16 @@  discard block
 block discarded – undo
102 102
     public function create(bool $reverse): void
103 103
     {
104 104
         $filename = $this->makeConfigFilename($this->configName);
105
-        if ($reverse) {
106
-            if (!$this->files->exists($filename)) {
105
+        if ($reverse){
106
+            if (!$this->files->exists($filename)){
107 107
                 throw new ScaffolderException("Config filename $filename doesn't exist");
108 108
             }
109 109
 
110 110
             $defaultsFromFile = require $filename;
111 111
             $this->declareGetters($defaultsFromFile);
112 112
             $this->declareStructure($this->configName, $this->defaultValues->get($defaultsFromFile));
113
-        } else {
114
-            if (!$this->files->exists($filename)) {
113
+        }else{
114
+            if (!$this->files->exists($filename)){
115 115
                 $this->touchConfigFile($filename);
116 116
             }
117 117
 
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
         $getters = [];
170 170
         $gettersByKey = [];
171 171
 
172
-        foreach ($defaults as $key => $value) {
172
+        foreach ($defaults as $key => $value){
173 173
             $key = (string)$key;
174 174
             $getter = $this->makeGetterName($key);
175 175
             $getters[] = $getter;
@@ -178,19 +178,19 @@  discard block
 block discarded – undo
178 178
             $method->setSource("return \$this->config['$key'];");
179 179
             $method->setComment("@return {$this->typeAnnotations->getAnnotation($value)}");
180 180
 
181
-            if (is_array($value)) {
181
+            if (is_array($value)){
182 182
                 $gettersByKey[] = compact('key', 'value');
183 183
             }
184 184
 
185 185
             $returnTypeHint = $this->typeHints->getHint(gettype($value));
186
-            if ($returnTypeHint !== null) {
186
+            if ($returnTypeHint !== null){
187 187
                 $method->setReturn($returnTypeHint);
188 188
             }
189 189
         }
190 190
 
191
-        foreach ($gettersByKey as $item) {
191
+        foreach ($gettersByKey as $item){
192 192
             $method = $this->declareGettersByKey($getters, $item['key'], $item['value']);
193
-            if ($method !== null) {
193
+            if ($method !== null){
194 194
                 $getters[] = $method->getName();
195 195
             }
196 196
         }
@@ -207,30 +207,30 @@  discard block
 block discarded – undo
207 207
     private function declareGettersByKey(array $methodNames, string $key, array $value): ?Method
208 208
     {
209 209
         //Won't create if there's less than 2 sub-items
210
-        if (count($value) < 2) {
210
+        if (count($value) < 2){
211 211
             return null;
212 212
         }
213 213
 
214 214
         $singularKey = $this->singularize($key);
215 215
         $name = $this->makeGetterName($singularKey);
216
-        if (in_array($name, $methodNames, true)) {
216
+        if (in_array($name, $methodNames, true)){
217 217
             $name = $this->makeGetterName($singularKey, 'get', 'by');
218 218
         }
219 219
 
220 220
         //Name conflict, won't merge
221
-        if (in_array($name, $methodNames, true)) {
221
+        if (in_array($name, $methodNames, true)){
222 222
             return null;
223 223
         }
224 224
 
225 225
         $keyType = defineArrayType(array_keys($value), '-mixed-');
226 226
         $valueType = defineArrayType(array_values($value), '-mixed-');
227 227
         //We need a fixed structure here
228
-        if ($keyType === '-mixed-' || $valueType === '-mixed-') {
228
+        if ($keyType === '-mixed-' || $valueType === '-mixed-'){
229 229
             return null;
230 230
         }
231 231
 
232 232
         //Won't create for associated arrays
233
-        if ($this->typeAnnotations->mapType($keyType) === 'int' && !isAssociativeArray($value)) {
233
+        if ($this->typeAnnotations->mapType($keyType) === 'int' && !isAssociativeArray($value)){
234 234
             return null;
235 235
         }
236 236
 
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 
245 245
         $param = $method->parameter($singularKey);
246 246
         $paramTypeHint = $this->typeHints->getHint($keyType);
247
-        if ($paramTypeHint !== null) {
247
+        if ($paramTypeHint !== null){
248 248
             $param->setType($paramTypeHint);
249 249
         }
250 250
 
@@ -260,13 +260,13 @@  discard block
 block discarded – undo
260 260
     private function makeGetterName(string $name, string $prefix = 'get', string $postfix = ''): string
261 261
     {
262 262
         $chunks = [];
263
-        if (!empty($prefix)) {
263
+        if (!empty($prefix)){
264 264
             $chunks[] = $prefix;
265 265
         }
266 266
 
267 267
         $name = $this->slugify->slugify($name, ['lowercase' => false]);
268 268
         $chunks[] = count($chunks) !== 0 ? $this->classify($name) : $name;
269
-        if (!empty($postfix)) {
269
+        if (!empty($postfix)){
270 270
             $chunks[] = ucfirst($postfix);
271 271
         }
272 272
 
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
      */
293 293
     private function classify(string $name): string
294 294
     {
295
-        return ( new InflectorFactory() )
295
+        return (new InflectorFactory())
296 296
             ->build()
297 297
             ->classify($name);
298 298
     }
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
      */
304 304
     private function singularize(string $name): string
305 305
     {
306
-        return ( new InflectorFactory() )
306
+        return (new InflectorFactory())
307 307
             ->build()
308 308
             ->singularize($name);
309 309
     }
Please login to merge, or discard this patch.
Braces   +35 added lines, -17 removed lines patch added patch discarded remove patch
@@ -102,16 +102,21 @@  discard block
 block discarded – undo
102 102
     public function create(bool $reverse): void
103 103
     {
104 104
         $filename = $this->makeConfigFilename($this->configName);
105
-        if ($reverse) {
106
-            if (!$this->files->exists($filename)) {
105
+        if ($reverse)
106
+        {
107
+            if (!$this->files->exists($filename))
108
+            {
107 109
                 throw new ScaffolderException("Config filename $filename doesn't exist");
108 110
             }
109 111
 
110 112
             $defaultsFromFile = require $filename;
111 113
             $this->declareGetters($defaultsFromFile);
112 114
             $this->declareStructure($this->configName, $this->defaultValues->get($defaultsFromFile));
113
-        } else {
114
-            if (!$this->files->exists($filename)) {
115
+        }
116
+        else
117
+        {
118
+            if (!$this->files->exists($filename))
119
+            {
115 120
                 $this->touchConfigFile($filename);
116 121
             }
117 122
 
@@ -169,7 +174,8 @@  discard block
 block discarded – undo
169 174
         $getters = [];
170 175
         $gettersByKey = [];
171 176
 
172
-        foreach ($defaults as $key => $value) {
177
+        foreach ($defaults as $key => $value)
178
+        {
173 179
             $key = (string)$key;
174 180
             $getter = $this->makeGetterName($key);
175 181
             $getters[] = $getter;
@@ -178,19 +184,23 @@  discard block
 block discarded – undo
178 184
             $method->setSource("return \$this->config['$key'];");
179 185
             $method->setComment("@return {$this->typeAnnotations->getAnnotation($value)}");
180 186
 
181
-            if (is_array($value)) {
187
+            if (is_array($value))
188
+            {
182 189
                 $gettersByKey[] = compact('key', 'value');
183 190
             }
184 191
 
185 192
             $returnTypeHint = $this->typeHints->getHint(gettype($value));
186
-            if ($returnTypeHint !== null) {
193
+            if ($returnTypeHint !== null)
194
+            {
187 195
                 $method->setReturn($returnTypeHint);
188 196
             }
189 197
         }
190 198
 
191
-        foreach ($gettersByKey as $item) {
199
+        foreach ($gettersByKey as $item)
200
+        {
192 201
             $method = $this->declareGettersByKey($getters, $item['key'], $item['value']);
193
-            if ($method !== null) {
202
+            if ($method !== null)
203
+            {
194 204
                 $getters[] = $method->getName();
195 205
             }
196 206
         }
@@ -207,30 +217,35 @@  discard block
 block discarded – undo
207 217
     private function declareGettersByKey(array $methodNames, string $key, array $value): ?Method
208 218
     {
209 219
         //Won't create if there's less than 2 sub-items
210
-        if (count($value) < 2) {
220
+        if (count($value) < 2)
221
+        {
211 222
             return null;
212 223
         }
213 224
 
214 225
         $singularKey = $this->singularize($key);
215 226
         $name = $this->makeGetterName($singularKey);
216
-        if (in_array($name, $methodNames, true)) {
227
+        if (in_array($name, $methodNames, true))
228
+        {
217 229
             $name = $this->makeGetterName($singularKey, 'get', 'by');
218 230
         }
219 231
 
220 232
         //Name conflict, won't merge
221
-        if (in_array($name, $methodNames, true)) {
233
+        if (in_array($name, $methodNames, true))
234
+        {
222 235
             return null;
223 236
         }
224 237
 
225 238
         $keyType = defineArrayType(array_keys($value), '-mixed-');
226 239
         $valueType = defineArrayType(array_values($value), '-mixed-');
227 240
         //We need a fixed structure here
228
-        if ($keyType === '-mixed-' || $valueType === '-mixed-') {
241
+        if ($keyType === '-mixed-' || $valueType === '-mixed-')
242
+        {
229 243
             return null;
230 244
         }
231 245
 
232 246
         //Won't create for associated arrays
233
-        if ($this->typeAnnotations->mapType($keyType) === 'int' && !isAssociativeArray($value)) {
247
+        if ($this->typeAnnotations->mapType($keyType) === 'int' && !isAssociativeArray($value))
248
+        {
234 249
             return null;
235 250
         }
236 251
 
@@ -244,7 +259,8 @@  discard block
 block discarded – undo
244 259
 
245 260
         $param = $method->parameter($singularKey);
246 261
         $paramTypeHint = $this->typeHints->getHint($keyType);
247
-        if ($paramTypeHint !== null) {
262
+        if ($paramTypeHint !== null)
263
+        {
248 264
             $param->setType($paramTypeHint);
249 265
         }
250 266
 
@@ -260,13 +276,15 @@  discard block
 block discarded – undo
260 276
     private function makeGetterName(string $name, string $prefix = 'get', string $postfix = ''): string
261 277
     {
262 278
         $chunks = [];
263
-        if (!empty($prefix)) {
279
+        if (!empty($prefix))
280
+        {
264 281
             $chunks[] = $prefix;
265 282
         }
266 283
 
267 284
         $name = $this->slugify->slugify($name, ['lowercase' => false]);
268 285
         $chunks[] = count($chunks) !== 0 ? $this->classify($name) : $name;
269
-        if (!empty($postfix)) {
286
+        if (!empty($postfix))
287
+        {
270 288
             $chunks[] = ucfirst($postfix);
271 289
         }
272 290
 
Please login to merge, or discard this patch.
src/Scaffolder/src/Declaration/FilterDeclaration.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,7 +60,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
src/Scaffolder/src/Declaration/MigrationDeclaration.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,8 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Scaffolder/src/Declaration/ConfigDeclaration/TypeAnnotations.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
src/Scaffolder/src/Declaration/ConfigDeclaration/Defaults.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,8 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.