@@ -42,16 +42,16 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function leaveNode(Node $node) |
44 | 44 | { |
45 | - if (!$node instanceof Node\Stmt\Namespace_) { |
|
45 | + if (!$node instanceof Node\Stmt\Namespace_){ |
|
46 | 46 | return null; |
47 | 47 | } |
48 | 48 | |
49 | 49 | $imported = []; |
50 | - if (!$this->node->hasConstructor && $this->node->constructorParams) { |
|
51 | - foreach ($this->node->constructorParams as $param) { |
|
52 | - if (!empty($param->type) && $param->type->fullName) { |
|
50 | + if (!$this->node->hasConstructor && $this->node->constructorParams){ |
|
51 | + foreach ($this->node->constructorParams as $param){ |
|
52 | + if (!empty($param->type) && $param->type->fullName){ |
|
53 | 53 | $import = [$param->type->fullName, $param->type->alias]; |
54 | - if (in_array($import, $imported, true)) { |
|
54 | + if (in_array($import, $imported, true)){ |
|
55 | 55 | continue; |
56 | 56 | } |
57 | 57 | |
@@ -61,9 +61,9 @@ discard block |
||
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
64 | - foreach ($this->node->dependencies as $dependency) { |
|
64 | + foreach ($this->node->dependencies as $dependency){ |
|
65 | 65 | $import = [$dependency->type->fullName, $dependency->type->alias]; |
66 | - if (in_array($import, $imported, true)) { |
|
66 | + if (in_array($import, $imported, true)){ |
|
67 | 67 | continue; |
68 | 68 | } |
69 | 69 | |
@@ -90,8 +90,8 @@ discard block |
||
90 | 90 | */ |
91 | 91 | private function definePlacementID(Node\Stmt\Namespace_ $node): int |
92 | 92 | { |
93 | - foreach ($node->stmts as $index => $child) { |
|
94 | - if ($child instanceof Node\Stmt\Class_) { |
|
93 | + foreach ($node->stmts as $index => $child){ |
|
94 | + if ($child instanceof Node\Stmt\Class_){ |
|
95 | 95 | return $index; |
96 | 96 | } |
97 | 97 | } |
@@ -108,13 +108,13 @@ discard block |
||
108 | 108 | { |
109 | 109 | $uses = $this->getExistingUseParts($stmts); |
110 | 110 | |
111 | - foreach ($nodes as $i => $node) { |
|
112 | - if (!$node instanceof Node\Stmt\Use_) { |
|
111 | + foreach ($nodes as $i => $node){ |
|
112 | + if (!$node instanceof Node\Stmt\Use_){ |
|
113 | 113 | continue; |
114 | 114 | } |
115 | 115 | |
116 | - foreach ($node->uses as $use) { |
|
117 | - if (in_array($use->name->parts, $uses, true)) { |
|
116 | + foreach ($node->uses as $use){ |
|
117 | + if (in_array($use->name->parts, $uses, true)){ |
|
118 | 118 | unset($nodes[$i]); |
119 | 119 | } |
120 | 120 | } |
@@ -130,12 +130,12 @@ discard block |
||
130 | 130 | private function getExistingUseParts(array $stmts): array |
131 | 131 | { |
132 | 132 | $uses = []; |
133 | - foreach ($stmts as $stmt) { |
|
134 | - if (!$stmt instanceof Node\Stmt\Use_) { |
|
133 | + foreach ($stmts as $stmt){ |
|
134 | + if (!$stmt instanceof Node\Stmt\Use_){ |
|
135 | 135 | continue; |
136 | 136 | } |
137 | 137 | |
138 | - foreach ($stmt->uses as $use) { |
|
138 | + foreach ($stmt->uses as $use){ |
|
139 | 139 | $uses[] = $use->name->parts; |
140 | 140 | } |
141 | 141 | } |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | private function buildUse(string $type, ?string $alias = null): Node\Stmt\Use_ |
152 | 152 | { |
153 | 153 | $b = new Use_(new Node\Name($type), Node\Stmt\Use_::TYPE_NORMAL); |
154 | - if (!empty($alias)) { |
|
154 | + if (!empty($alias)){ |
|
155 | 155 | $b->as($alias); |
156 | 156 | } |
157 | 157 |
@@ -42,16 +42,21 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function leaveNode(Node $node) |
44 | 44 | { |
45 | - if (!$node instanceof Node\Stmt\Namespace_) { |
|
45 | + if (!$node instanceof Node\Stmt\Namespace_) |
|
46 | + { |
|
46 | 47 | return null; |
47 | 48 | } |
48 | 49 | |
49 | 50 | $imported = []; |
50 | - if (!$this->node->hasConstructor && $this->node->constructorParams) { |
|
51 | - foreach ($this->node->constructorParams as $param) { |
|
52 | - if (!empty($param->type) && $param->type->fullName) { |
|
51 | + if (!$this->node->hasConstructor && $this->node->constructorParams) |
|
52 | + { |
|
53 | + foreach ($this->node->constructorParams as $param) |
|
54 | + { |
|
55 | + if (!empty($param->type) && $param->type->fullName) |
|
56 | + { |
|
53 | 57 | $import = [$param->type->fullName, $param->type->alias]; |
54 | - if (in_array($import, $imported, true)) { |
|
58 | + if (in_array($import, $imported, true)) |
|
59 | + { |
|
55 | 60 | continue; |
56 | 61 | } |
57 | 62 | |
@@ -61,9 +66,11 @@ discard block |
||
61 | 66 | } |
62 | 67 | } |
63 | 68 | |
64 | - foreach ($this->node->dependencies as $dependency) { |
|
69 | + foreach ($this->node->dependencies as $dependency) |
|
70 | + { |
|
65 | 71 | $import = [$dependency->type->fullName, $dependency->type->alias]; |
66 | - if (in_array($import, $imported, true)) { |
|
72 | + if (in_array($import, $imported, true)) |
|
73 | + { |
|
67 | 74 | continue; |
68 | 75 | } |
69 | 76 | |
@@ -90,8 +97,10 @@ discard block |
||
90 | 97 | */ |
91 | 98 | private function definePlacementID(Node\Stmt\Namespace_ $node): int |
92 | 99 | { |
93 | - foreach ($node->stmts as $index => $child) { |
|
94 | - if ($child instanceof Node\Stmt\Class_) { |
|
100 | + foreach ($node->stmts as $index => $child) |
|
101 | + { |
|
102 | + if ($child instanceof Node\Stmt\Class_) |
|
103 | + { |
|
95 | 104 | return $index; |
96 | 105 | } |
97 | 106 | } |
@@ -108,13 +117,17 @@ discard block |
||
108 | 117 | { |
109 | 118 | $uses = $this->getExistingUseParts($stmts); |
110 | 119 | |
111 | - foreach ($nodes as $i => $node) { |
|
112 | - if (!$node instanceof Node\Stmt\Use_) { |
|
120 | + foreach ($nodes as $i => $node) |
|
121 | + { |
|
122 | + if (!$node instanceof Node\Stmt\Use_) |
|
123 | + { |
|
113 | 124 | continue; |
114 | 125 | } |
115 | 126 | |
116 | - foreach ($node->uses as $use) { |
|
117 | - if (in_array($use->name->parts, $uses, true)) { |
|
127 | + foreach ($node->uses as $use) |
|
128 | + { |
|
129 | + if (in_array($use->name->parts, $uses, true)) |
|
130 | + { |
|
118 | 131 | unset($nodes[$i]); |
119 | 132 | } |
120 | 133 | } |
@@ -130,12 +143,15 @@ discard block |
||
130 | 143 | private function getExistingUseParts(array $stmts): array |
131 | 144 | { |
132 | 145 | $uses = []; |
133 | - foreach ($stmts as $stmt) { |
|
134 | - if (!$stmt instanceof Node\Stmt\Use_) { |
|
146 | + foreach ($stmts as $stmt) |
|
147 | + { |
|
148 | + if (!$stmt instanceof Node\Stmt\Use_) |
|
149 | + { |
|
135 | 150 | continue; |
136 | 151 | } |
137 | 152 | |
138 | - foreach ($stmt->uses as $use) { |
|
153 | + foreach ($stmt->uses as $use) |
|
154 | + { |
|
139 | 155 | $uses[] = $use->name->parts; |
140 | 156 | } |
141 | 157 | } |
@@ -151,7 +167,8 @@ discard block |
||
151 | 167 | private function buildUse(string $type, ?string $alias = null): Node\Stmt\Use_ |
152 | 168 | { |
153 | 169 | $b = new Use_(new Node\Name($type), Node\Stmt\Use_::TYPE_NORMAL); |
154 | - if (!empty($alias)) { |
|
170 | + if (!empty($alias)) |
|
171 | + { |
|
155 | 172 | $b->as($alias); |
156 | 173 | } |
157 | 174 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | public function __get(string $name) |
34 | 34 | { |
35 | 35 | $container = ContainerScope::getContainer(); |
36 | - if ($container === null || !$container->has(PrototypeRegistry::class)) { |
|
36 | + if ($container === null || !$container->has(PrototypeRegistry::class)){ |
|
37 | 37 | throw new ScopeException( |
38 | 38 | "Unable to resolve prototyped dependency `{$name}`, invalid container scope" |
39 | 39 | ); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $target === null || |
48 | 48 | $target instanceof \Throwable || |
49 | 49 | $target->type->fullName === null |
50 | - ) { |
|
50 | + ){ |
|
51 | 51 | throw new PrototypeException( |
52 | 52 | "Undefined prototype property `{$name}`", |
53 | 53 | 0, |
@@ -33,7 +33,8 @@ |
||
33 | 33 | public function __get(string $name) |
34 | 34 | { |
35 | 35 | $container = ContainerScope::getContainer(); |
36 | - if ($container === null || !$container->has(PrototypeRegistry::class)) { |
|
36 | + if ($container === null || !$container->has(PrototypeRegistry::class)) |
|
37 | + { |
|
37 | 38 | throw new ScopeException( |
38 | 39 | "Unable to resolve prototyped dependency `{$name}`, invalid container scope" |
39 | 40 | ); |
@@ -64,15 +64,15 @@ |
||
64 | 64 | public function resolveProperty(string $name) |
65 | 65 | { |
66 | 66 | $dependency = $this->dependencies[$name] ?? null; |
67 | - if ($dependency === null) { |
|
67 | + if ($dependency === null){ |
|
68 | 68 | return null; |
69 | 69 | } |
70 | 70 | |
71 | - try { |
|
71 | + try{ |
|
72 | 72 | $this->container->get($dependency->type->name()); |
73 | 73 | |
74 | 74 | return $dependency; |
75 | - } catch (ContainerExceptionInterface $e) { |
|
75 | + }catch (ContainerExceptionInterface $e){ |
|
76 | 76 | return $e; |
77 | 77 | } |
78 | 78 | } |
@@ -64,15 +64,19 @@ |
||
64 | 64 | public function resolveProperty(string $name) |
65 | 65 | { |
66 | 66 | $dependency = $this->dependencies[$name] ?? null; |
67 | - if ($dependency === null) { |
|
67 | + if ($dependency === null) |
|
68 | + { |
|
68 | 69 | return null; |
69 | 70 | } |
70 | 71 | |
71 | - try { |
|
72 | + try |
|
73 | + { |
|
72 | 74 | $this->container->get($dependency->type->name()); |
73 | 75 | |
74 | 76 | return $dependency; |
75 | - } catch (ContainerExceptionInterface $e) { |
|
77 | + } |
|
78 | + catch (ContainerExceptionInterface $e) |
|
79 | + { |
|
76 | 80 | return $e; |
77 | 81 | } |
78 | 82 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | public static function shortName(string $name): string |
26 | 26 | { |
27 | 27 | $pos = mb_strrpos($name, '\\'); |
28 | - if ($pos === false) { |
|
28 | + if ($pos === false){ |
|
29 | 29 | return $name; |
30 | 30 | } |
31 | 31 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | public static function trimTrailingDigits(string $name, int $number): string |
59 | 59 | { |
60 | 60 | $pos = mb_strripos($name, (string)$number); |
61 | - if ($pos === false) { |
|
61 | + if ($pos === false){ |
|
62 | 62 | return $name; |
63 | 63 | } |
64 | 64 |
@@ -25,7 +25,8 @@ discard block |
||
25 | 25 | public static function shortName(string $name): string |
26 | 26 | { |
27 | 27 | $pos = mb_strrpos($name, '\\'); |
28 | - if ($pos === false) { |
|
28 | + if ($pos === false) |
|
29 | + { |
|
29 | 30 | return $name; |
30 | 31 | } |
31 | 32 | |
@@ -58,7 +59,8 @@ discard block |
||
58 | 59 | public static function trimTrailingDigits(string $name, int $number): string |
59 | 60 | { |
60 | 61 | $pos = mb_strripos($name, (string)$number); |
61 | - if ($pos === false) { |
|
62 | + if ($pos === false) |
|
63 | + { |
|
62 | 64 | return $name; |
63 | 65 | } |
64 | 66 |
@@ -57,7 +57,7 @@ |
||
57 | 57 | private function traverse(string $code, NodeVisitor ...$visitors): void |
58 | 58 | { |
59 | 59 | $tr = new NodeTraverser(); |
60 | - foreach ($visitors as $visitor) { |
|
60 | + foreach ($visitors as $visitor){ |
|
61 | 61 | $tr->addVisitor($visitor); |
62 | 62 | } |
63 | 63 |
@@ -57,7 +57,8 @@ |
||
57 | 57 | private function traverse(string $code, NodeVisitor ...$visitors): void |
58 | 58 | { |
59 | 59 | $tr = new NodeTraverser(); |
60 | - foreach ($visitors as $visitor) { |
|
60 | + foreach ($visitors as $visitor) |
|
61 | + { |
|
61 | 62 | $tr->addVisitor($visitor); |
62 | 63 | } |
63 | 64 |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | $e = new PropertyExtractor(); |
22 | 22 | |
23 | 23 | $expected = ['test', 'test2', 'test3', 'testClass']; |
24 | - $prototypes = $e->getPrototypeProperties(file_get_contents(__DIR__ . '/Fixtures/TestClass.php')); |
|
24 | + $prototypes = $e->getPrototypeProperties(file_get_contents(__DIR__.'/Fixtures/TestClass.php')); |
|
25 | 25 | sort($prototypes); |
26 | 26 | $this->assertSame($expected, $prototypes); |
27 | 27 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $e = new PropertyExtractor(); |
32 | 32 | $this->assertSame( |
33 | 33 | [], |
34 | - $e->getPrototypeProperties(file_get_contents(__DIR__ . '/Fixtures/HydratedClass.php')) |
|
34 | + $e->getPrototypeProperties(file_get_contents(__DIR__.'/Fixtures/HydratedClass.php')) |
|
35 | 35 | ); |
36 | 36 | } |
37 | 37 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | public function testNoClass(): void |
19 | 19 | { |
20 | 20 | $this->expectException(ClassNotDeclaredException::class); |
21 | - $this->getExtractor()->extract(dirname(__DIR__) . '/Fixtures/noClass.php', []); |
|
21 | + $this->getExtractor()->extract(dirname(__DIR__).'/Fixtures/noClass.php', []); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | private function getExtractor(): NodeExtractor |
@@ -28,15 +28,15 @@ |
||
28 | 28 | // empty input |
29 | 29 | [[], 5, 5], |
30 | 30 | // in the gap (not taken) |
31 | - [[3, 4, 8, 9,], 6, 6], |
|
32 | - [[3, 4, 8, 9,], 1, 1], |
|
31 | + [[3, 4, 8, 9, ], 6, 6], |
|
32 | + [[3, 4, 8, 9, ], 1, 1], |
|
33 | 33 | // in the sequence (taken) |
34 | - [[3, 4, 8, 9,], 4, 0], |
|
35 | - [[0, 1, 4, 5,], 5, 2], |
|
34 | + [[3, 4, 8, 9, ], 4, 0], |
|
35 | + [[0, 1, 4, 5, ], 5, 2], |
|
36 | 36 | // do not use "1" |
37 | - [[0, 3, 4, 8,], 4, 2], |
|
37 | + [[0, 3, 4, 8, ], 4, 2], |
|
38 | 38 | // full sequence, take next |
39 | - [[0, 1, 2, 3,], 3, 4], |
|
39 | + [[0, 1, 2, 3, ], 3, 4], |
|
40 | 40 | [[0], 0, 2], |
41 | 41 | ]; |
42 | 42 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | ?int $int = 123, |
21 | 21 | \StdClass $nullableClass2 = null, |
22 | 22 | string ...$variadicVar |
23 | - ) { |
|
23 | + ){ |
|
24 | 24 | $var2 = new ATest3(); |
25 | 25 | } |
26 | 26 | } |