Passed
Pull Request — master (#361)
by Valentin
08:13 queued 03:37
created
src/Prototype/src/Command/ListCommand.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,8 @@  discard block
 block discarded – undo
22 22
     public function perform(): void
23 23
     {
24 24
         $prototyped = $this->locator->getTargetClasses();
25
-        if ($prototyped === []) {
25
+        if ($prototyped === [])
26
+        {
26 27
             $this->writeln('<comment>No prototyped classes found.</comment>');
27 28
 
28 29
             return;
@@ -30,7 +31,8 @@  discard block
 block discarded – undo
30 31
 
31 32
         $grid = $this->table(['Class:', 'Property:', 'Target:']);
32 33
 
33
-        foreach ($prototyped as $class) {
34
+        foreach ($prototyped as $class)
35
+        {
34 36
             $proto = $this->getPrototypeProperties($class, $prototyped);
35 37
 
36 38
             $grid->addRow([$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)]);
Please login to merge, or discard this patch.
src/Prototype/src/Command/AbstractCommand.php 1 patch
Braces   +19 added lines, -9 removed lines patch added patch discarded remove patch
@@ -58,7 +58,8 @@  discard block
 block discarded – undo
58 58
         $results = [$this->readProperties($class)];
59 59
 
60 60
         $parent = $class->getParentClass();
61
-        while ($parent instanceof \ReflectionClass && isset($all[$parent->getName()])) {
61
+        while ($parent instanceof \ReflectionClass && isset($all[$parent->getName()]))
62
+        {
62 63
             $results[] = $this->readProperties($parent);
63 64
             $parent = $parent->getParentClass();
64 65
         }
@@ -91,8 +92,10 @@  discard block
 block discarded – undo
91 92
     {
92 93
         $result = [];
93 94
 
94
-        foreach ($properties as $target) {
95
-            if ($target instanceof \Throwable) {
95
+        foreach ($properties as $target)
96
+        {
97
+            if ($target instanceof \Throwable)
98
+            {
96 99
                 $result[] = sprintf(
97 100
                     '<fg=red>%s [f: %s, l: %s]</fg=red>',
98 101
                     $target->getMessage(),
@@ -102,7 +105,8 @@  discard block
 block discarded – undo
102 105
                 continue;
103 106
             }
104 107
 
105
-            if ($target === null) {
108
+            if ($target === null)
109
+            {
106 110
                 $result[] = '<fg=yellow>undefined</fg=yellow>';
107 111
                 continue;
108 112
             }
@@ -115,16 +119,21 @@  discard block
 block discarded – undo
115 119
 
116 120
     private function readProperties(\ReflectionClass $class): array
117 121
     {
118
-        if (isset($this->cache[$class->getFileName()])) {
122
+        if (isset($this->cache[$class->getFileName()]))
123
+        {
119 124
             $proto = $this->cache[$class->getFileName()];
120
-        } else {
125
+        }
126
+        else
127
+        {
121 128
             $proto = $this->getExtractor()->getPrototypeProperties(file_get_contents($class->getFilename()));
122 129
             $this->cache[$class->getFileName()] = $proto;
123 130
         }
124 131
 
125 132
         $result = [];
126
-        foreach ($proto as $name) {
127
-            if (!isset($result[$name])) {
133
+        foreach ($proto as $name)
134
+        {
135
+            if (!isset($result[$name]))
136
+            {
128 137
                 $result[$name] = $this->registry->resolveProperty($name);
129 138
             }
130 139
         }
@@ -134,7 +143,8 @@  discard block
 block discarded – undo
134 143
 
135 144
     private function reverse(array $results): ?\Generator
136 145
     {
137
-        foreach (array_reverse($results) as $result) {
146
+        foreach (array_reverse($results) as $result)
147
+        {
138 148
             yield from $result;
139 149
         }
140 150
     }
Please login to merge, or discard this patch.
src/Prototype/src/Command/InjectCommand.php 1 patch
Braces   +25 added lines, -12 removed lines patch added patch discarded remove patch
@@ -55,7 +55,8 @@  discard block
 block discarded – undo
55 55
     public function perform(): void
56 56
     {
57 57
         $prototyped = $this->locator->getTargetClasses();
58
-        if ($prototyped === []) {
58
+        if ($prototyped === [])
59
+        {
59 60
             $this->writeln('<comment>No prototyped classes found.</comment>');
60 61
 
61 62
             return;
@@ -63,18 +64,23 @@  discard block
 block discarded – undo
63 64
 
64 65
         $targets = [];
65 66
 
66
-        foreach ($prototyped as $class) {
67
+        foreach ($prototyped as $class)
68
+        {
67 69
             $proto = $this->getPrototypeProperties($class, $prototyped);
68
-            if (empty($proto)) {
70
+            if (empty($proto))
71
+            {
69 72
                 $modified = $this->modify($class, $proto);
70
-                if ($modified !== null) {
73
+                if ($modified !== null)
74
+                {
71 75
                     $targets[] = $modified;
72 76
                 }
73 77
                 continue;
74 78
             }
75 79
 
76
-            foreach ($proto as $target) {
77
-                if ($target instanceof \Throwable) {
80
+            foreach ($proto as $target)
81
+            {
82
+                if ($target instanceof \Throwable)
83
+                {
78 84
                     $targets[] = [
79 85
                         $class->getName(),
80 86
                         $target->getMessage(),
@@ -83,7 +89,8 @@  discard block
 block discarded – undo
83 89
                     continue 2;
84 90
                 }
85 91
 
86
-                if ($target === null) {
92
+                if ($target === null)
93
+                {
87 94
                     continue 2;
88 95
                 }
89 96
             }
@@ -91,14 +98,17 @@  discard block
 block discarded – undo
91 98
             $targets[] = [$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)];
92 99
 
93 100
             $modified = $this->modify($class, $proto);
94
-            if ($modified !== null) {
101
+            if ($modified !== null)
102
+            {
95 103
                 $targets[] = $modified;
96 104
             }
97 105
         }
98 106
 
99
-        if (!empty($targets)) {
107
+        if (!empty($targets))
108
+        {
100 109
             $grid = $this->table(['Class:', 'Property:', 'Target:']);
101
-            foreach ($targets as $target) {
110
+            foreach ($targets as $target)
111
+            {
102 112
                 $grid->addRow($target);
103 113
             }
104 114
 
@@ -109,7 +119,8 @@  discard block
 block discarded – undo
109 119
     private function modify(\ReflectionClass $class, array $proto): ?array
110 120
     {
111 121
         $classDefinition = $this->extractor->extract($class->getFilename(), $proto);
112
-        try {
122
+        try
123
+        {
113 124
             $modified = $this->injector->injectDependencies(
114 125
                 file_get_contents($class->getFileName()),
115 126
                 $classDefinition,
@@ -120,7 +131,9 @@  discard block
 block discarded – undo
120 131
 
121 132
             file_put_contents($class->getFileName(), $modified);
122 133
             return null;
123
-        } catch (\Throwable $e) {
134
+        }
135
+        catch (\Throwable $e)
136
+        {
124 137
             return [$class->getName(), $e->getMessage(), "{$e->getFile()}:L{$e->getLine()}"];
125 138
         }
126 139
     }
Please login to merge, or discard this patch.
src/Prototype/src/NodeVisitors/UpdateConstructor.php 1 patch
Braces   +53 added lines, -26 removed lines patch added patch discarded remove patch
@@ -42,12 +42,14 @@  discard block
 block discarded – undo
42 42
      */
43 43
     public function leaveNode(Node $node)
44 44
     {
45
-        if (!$node instanceof Node\Stmt\Class_) {
45
+        if (!$node instanceof Node\Stmt\Class_)
46
+        {
46 47
             return null;
47 48
         }
48 49
 
49 50
         $constructor = $this->getConstructorAttribute($node);
50
-        if (!$this->definition->hasConstructor && $this->definition->constructorParams) {
51
+        if (!$this->definition->hasConstructor && $this->definition->constructorParams)
52
+        {
51 53
             $this->addParentConstructorCall($constructor);
52 54
         }
53 55
         $this->addDependencies($constructor);
@@ -66,7 +68,8 @@  discard block
 block discarded – undo
66 68
      */
67 69
     private function addDependencies(Node\Stmt\ClassMethod $constructor): void
68 70
     {
69
-        foreach ($this->definition->dependencies as $dependency) {
71
+        foreach ($this->definition->dependencies as $dependency)
72
+        {
70 73
             $constructor->params[] = (new Param($dependency->var))->setType(
71 74
                 new Node\Name($this->getPropertyType($dependency))
72 75
             )->getNode();
@@ -91,34 +94,41 @@  discard block
 block discarded – undo
91 94
     private function addParentConstructorCall(Node\Stmt\ClassMethod $constructor): void
92 95
     {
93 96
         $parentConstructorDependencies = [];
94
-        foreach ($this->definition->constructorParams as $param) {
97
+        foreach ($this->definition->constructorParams as $param)
98
+        {
95 99
             $parentConstructorDependencies[] = new Node\Arg(new Node\Expr\Variable($param->name));
96 100
 
97 101
             $cp = new Param($param->name);
98
-            if (!empty($param->type)) {
102
+            if (!empty($param->type))
103
+            {
99 104
                 $type = $this->getParamType($param);
100
-                if ($param->nullable) {
105
+                if ($param->nullable)
106
+                {
101 107
                     $type = "?$type";
102 108
                 }
103 109
 
104 110
                 $cp->setType(new Node\Name($type));
105 111
             }
106 112
 
107
-            if ($param->byRef) {
113
+            if ($param->byRef)
114
+            {
108 115
                 $cp->makeByRef();
109 116
             }
110 117
 
111
-            if ($param->isVariadic) {
118
+            if ($param->isVariadic)
119
+            {
112 120
                 $cp->makeVariadic();
113 121
             }
114 122
 
115
-            if ($param->hasDefault) {
123
+            if ($param->hasDefault)
124
+            {
116 125
                 $cp->setDefault($param->default);
117 126
             }
118 127
             $constructor->params[] = $cp->getNode();
119 128
         }
120 129
 
121
-        if ($parentConstructorDependencies) {
130
+        if ($parentConstructorDependencies)
131
+        {
122 132
             array_unshift(
123 133
                 $constructor->stmts,
124 134
                 new Node\Stmt\Expression(
@@ -153,18 +163,23 @@  discard block
 block discarded – undo
153 163
 
154 164
         $params = [];
155 165
 
156
-        foreach ($this->definition->dependencies as $dependency) {
166
+        foreach ($this->definition->dependencies as $dependency)
167
+        {
157 168
             $params[] = new Annotation\Line(
158 169
                 sprintf('%s $%s', $this->getPropertyType($dependency), $dependency->var),
159 170
                 'param'
160 171
             );
161 172
         }
162 173
 
163
-        if (!$this->definition->hasConstructor) {
164
-            foreach ($this->definition->constructorParams as $param) {
165
-                if (!empty($param->type)) {
174
+        if (!$this->definition->hasConstructor)
175
+        {
176
+            foreach ($this->definition->constructorParams as $param)
177
+            {
178
+                if (!empty($param->type))
179
+                {
166 180
                     $type = $this->getParamType($param);
167
-                    if ($param->nullable) {
181
+                    if ($param->nullable)
182
+                    {
168 183
                         $type = "$type|null";
169 184
                     }
170 185
 
@@ -172,7 +187,9 @@  discard block
 block discarded – undo
172 187
                         sprintf($param->isVariadic ? '%s ...$%s' : '%s $%s', $type, $param->name),
173 188
                         'param'
174 189
                     );
175
-                } else {
190
+                }
191
+                else
192
+                {
176 193
                     $params[] = new Annotation\Line(
177 194
                         sprintf('$%s', $param->name),
178 195
                         'param'
@@ -183,12 +200,14 @@  discard block
 block discarded – undo
183 200
 
184 201
         $placementID = 0;
185 202
         $previous = null;
186
-        foreach ($an->lines as $index => $line) {
203
+        foreach ($an->lines as $index => $line)
204
+        {
187 205
             // always next node
188 206
             $placementID = $index + 1;
189 207
 
190 208
             // inject before this parameters
191
-            if ($line->is(['throws', 'return'])) {
209
+            if ($line->is(['throws', 'return']))
210
+            {
192 211
                 // insert before given node
193 212
                 $placementID--;
194 213
                 break;
@@ -197,7 +216,8 @@  discard block
 block discarded – undo
197 216
             $previous = $line;
198 217
         }
199 218
 
200
-        if ($previous !== null && !$previous->isEmpty()) {
219
+        if ($previous !== null && !$previous->isEmpty())
220
+        {
201 221
             $placementID++;
202 222
         }
203 223
 
@@ -212,9 +232,12 @@  discard block
 block discarded – undo
212 232
      */
213 233
     private function getPropertyType(Dependency $dependency): string
214 234
     {
215
-        foreach ($this->definition->getStmts() as $stmt) {
216
-            if ($stmt->name === $dependency->type->fullName) {
217
-                if ($stmt->alias) {
235
+        foreach ($this->definition->getStmts() as $stmt)
236
+        {
237
+            if ($stmt->name === $dependency->type->fullName)
238
+            {
239
+                if ($stmt->alias)
240
+                {
218 241
                     return $stmt->alias;
219 242
                 }
220 243
             }
@@ -229,15 +252,19 @@  discard block
 block discarded – undo
229 252
      */
230 253
     private function getParamType(ClassNode\ConstructorParam $param): string
231 254
     {
232
-        foreach ($this->definition->getStmts() as $stmt) {
233
-            if ($stmt->name === $param->type->fullName) {
234
-                if ($stmt->alias) {
255
+        foreach ($this->definition->getStmts() as $stmt)
256
+        {
257
+            if ($stmt->name === $param->type->fullName)
258
+            {
259
+                if ($stmt->alias)
260
+                {
235 261
                     return $stmt->alias;
236 262
                 }
237 263
             }
238 264
         }
239 265
 
240
-        if ($param->type->alias) {
266
+        if ($param->type->alias)
267
+        {
241 268
             return $param->type->alias;
242 269
         }
243 270
 
Please login to merge, or discard this patch.