@@ -37,7 +37,8 @@ discard block |
||
37 | 37 | ->method('getArgument') |
38 | 38 | ->willReturnOnConsecutiveCalls(5, 'foo', ['foo', 'bar'], 0.5, true); |
39 | 39 | |
40 | - $command = new #[AsCommand('foo')] class extends Command { |
|
40 | + $command = new #[AsCommand('foo')] class extends Command |
|
41 | + { |
|
41 | 42 | #[Argument] |
42 | 43 | public int $intVal; |
43 | 44 | |
@@ -76,7 +77,8 @@ discard block |
||
76 | 77 | ->expects($this->never()) |
77 | 78 | ->method('getArgument'); |
78 | 79 | |
79 | - $command = new #[AsCommand('foo')] class extends Command { |
|
80 | + $command = new #[AsCommand('foo')] class extends Command |
|
81 | + { |
|
80 | 82 | #[Argument] |
81 | 83 | public int $arg; |
82 | 84 | }; |
@@ -99,7 +101,8 @@ discard block |
||
99 | 101 | ->method('getOption') |
100 | 102 | ->willReturnOnConsecutiveCalls(5, 'foo', ['foo', 'bar'], 0.5, true, true); |
101 | 103 | |
102 | - $command = new #[AsCommand('foo')] class extends Command { |
|
104 | + $command = new #[AsCommand('foo')] class extends Command |
|
105 | + { |
|
103 | 106 | #[Option(mode: InputOption::VALUE_REQUIRED)] |
104 | 107 | public int $intVal; |
105 | 108 | |
@@ -142,7 +145,8 @@ discard block |
||
142 | 145 | ->method('getOption') |
143 | 146 | ->willReturnOnConsecutiveCalls(1, null, 0); |
144 | 147 | |
145 | - $command = new #[AsCommand('foo')] class extends Command { |
|
148 | + $command = new #[AsCommand('foo')] class extends Command |
|
149 | + { |
|
146 | 150 | #[Option(mode: InputOption::VALUE_REQUIRED)] |
147 | 151 | public Status $required; |
148 | 152 | |
@@ -173,7 +177,8 @@ discard block |
||
173 | 177 | ->expects($this->never()) |
174 | 178 | ->method('getOption'); |
175 | 179 | |
176 | - $command = new #[AsCommand('foo')] class extends Command { |
|
180 | + $command = new #[AsCommand('foo')] class extends Command |
|
181 | + { |
|
177 | 182 | #[Option(mode: InputOption::VALUE_REQUIRED)] |
178 | 183 | public int $option; |
179 | 184 | }; |
@@ -197,7 +202,8 @@ discard block |
||
197 | 202 | ->method('getOption') |
198 | 203 | ->willReturn(null); |
199 | 204 | |
200 | - $command = new #[AsCommand('foo')] class extends Command { |
|
205 | + $command = new #[AsCommand('foo')] class extends Command |
|
206 | + { |
|
201 | 207 | #[Option(mode: InputOption::VALUE_REQUIRED)] |
202 | 208 | public int $option; |
203 | 209 | }; |
@@ -220,7 +226,8 @@ discard block |
||
220 | 226 | ->method('getOption') |
221 | 227 | ->willReturn(null); |
222 | 228 | |
223 | - $command = new #[AsCommand('foo')] class extends Command { |
|
229 | + $command = new #[AsCommand('foo')] class extends Command |
|
230 | + { |
|
224 | 231 | #[Option(mode: InputOption::VALUE_REQUIRED)] |
225 | 232 | public ?int $intVal; |
226 | 233 | }; |
@@ -37,7 +37,8 @@ discard block |
||
37 | 37 | { |
38 | 38 | $attribute = $this->reader->firstClassMetadata($reflection, AsCommand::class); |
39 | 39 | |
40 | - if ($attribute === null) { |
|
40 | + if ($attribute === null) |
|
41 | + { |
|
41 | 42 | $attribute = $reflection->getAttributes(SymfonyAsCommand::class)[0]->newInstance(); |
42 | 43 | } |
43 | 44 | |
@@ -54,13 +55,16 @@ discard block |
||
54 | 55 | { |
55 | 56 | $reflection = new \ReflectionClass($command); |
56 | 57 | |
57 | - foreach ($reflection->getProperties() as $property) { |
|
58 | + foreach ($reflection->getProperties() as $property) |
|
59 | + { |
|
58 | 60 | $attribute = $this->reader->firstPropertyMetadata($property, Argument::class); |
59 | - if ($attribute === null) { |
|
61 | + if ($attribute === null) |
|
62 | + { |
|
60 | 63 | continue; |
61 | 64 | } |
62 | 65 | |
63 | - if ($input->hasArgument($attribute->name ?? $property->getName())) { |
|
66 | + if ($input->hasArgument($attribute->name ?? $property->getName())) |
|
67 | + { |
|
64 | 68 | $property->setValue( |
65 | 69 | $command, |
66 | 70 | $this->typecast($input->getArgument($attribute->name ?? $property->getName()), $property) |
@@ -68,16 +72,20 @@ discard block |
||
68 | 72 | } |
69 | 73 | } |
70 | 74 | |
71 | - foreach ($reflection->getProperties() as $property) { |
|
75 | + foreach ($reflection->getProperties() as $property) |
|
76 | + { |
|
72 | 77 | $attribute = $this->reader->firstPropertyMetadata($property, Option::class); |
73 | - if ($attribute === null) { |
|
78 | + if ($attribute === null) |
|
79 | + { |
|
74 | 80 | continue; |
75 | 81 | } |
76 | 82 | |
77 | - if ($input->hasOption($attribute->name ?? $property->getName())) { |
|
83 | + if ($input->hasOption($attribute->name ?? $property->getName())) |
|
84 | + { |
|
78 | 85 | $value = $this->typecast($input->getOption($attribute->name ?? $property->getName()), $property); |
79 | 86 | |
80 | - if ($value !== null || $this->getPropertyType($property)->allowsNull()) { |
|
87 | + if ($value !== null || $this->getPropertyType($property)->allowsNull()) |
|
88 | + { |
|
81 | 89 | $property->setValue($command, $value); |
82 | 90 | } |
83 | 91 | } |
@@ -88,9 +96,11 @@ discard block |
||
88 | 96 | { |
89 | 97 | $result = []; |
90 | 98 | $arrayArgument = null; |
91 | - foreach ($reflection->getProperties() as $property) { |
|
99 | + foreach ($reflection->getProperties() as $property) |
|
100 | + { |
|
92 | 101 | $attribute = $this->reader->firstPropertyMetadata($property, Argument::class); |
93 | - if ($attribute === null) { |
|
102 | + if ($attribute === null) |
|
103 | + { |
|
94 | 104 | continue; |
95 | 105 | } |
96 | 106 | |
@@ -113,19 +123,22 @@ discard block |
||
113 | 123 | suggestedValues: $attribute->suggestedValues |
114 | 124 | ); |
115 | 125 | |
116 | - if ($arrayArgument !== null && $isArray) { |
|
126 | + if ($arrayArgument !== null && $isArray) |
|
127 | + { |
|
117 | 128 | throw new ConfiguratorException('There must be only one array argument!'); |
118 | 129 | } |
119 | 130 | |
120 | 131 | // It must be used at the end of the argument list. |
121 | - if ($isArray) { |
|
132 | + if ($isArray) |
|
133 | + { |
|
122 | 134 | $arrayArgument = $argument; |
123 | 135 | continue; |
124 | 136 | } |
125 | 137 | $result[] = $argument; |
126 | 138 | } |
127 | 139 | |
128 | - if ($arrayArgument !== null) { |
|
140 | + if ($arrayArgument !== null) |
|
141 | + { |
|
129 | 142 | $result[] = $arrayArgument; |
130 | 143 | } |
131 | 144 | |
@@ -135,21 +148,26 @@ discard block |
||
135 | 148 | private function parseOptions(\ReflectionClass $reflection): array |
136 | 149 | { |
137 | 150 | $result = []; |
138 | - foreach ($reflection->getProperties() as $property) { |
|
151 | + foreach ($reflection->getProperties() as $property) |
|
152 | + { |
|
139 | 153 | $attribute = $this->reader->firstPropertyMetadata($property, Option::class); |
140 | - if ($attribute === null) { |
|
154 | + if ($attribute === null) |
|
155 | + { |
|
141 | 156 | continue; |
142 | 157 | } |
143 | 158 | |
144 | 159 | $type = $this->getPropertyType($property); |
145 | 160 | $mode = $attribute->mode; |
146 | 161 | |
147 | - if ($mode === null) { |
|
162 | + if ($mode === null) |
|
163 | + { |
|
148 | 164 | $mode = $this->guessOptionMode($type, $property); |
149 | 165 | } |
150 | 166 | |
151 | - if ($mode === InputOption::VALUE_NONE || $mode === InputOption::VALUE_NEGATABLE) { |
|
152 | - if ($type->getName() !== 'bool') { |
|
167 | + if ($mode === InputOption::VALUE_NONE || $mode === InputOption::VALUE_NEGATABLE) |
|
168 | + { |
|
169 | + if ($type->getName() !== 'bool') |
|
170 | + { |
|
153 | 171 | throw new ConfiguratorException( |
154 | 172 | 'Options properties with mode `VALUE_NONE` or `VALUE_NEGATABLE` must be bool!' |
155 | 173 | ); |
@@ -175,7 +193,8 @@ discard block |
||
175 | 193 | { |
176 | 194 | $type = $property->hasType() ? $property->getType() : null; |
177 | 195 | |
178 | - if (!$type instanceof \ReflectionNamedType || $value === null) { |
|
196 | + if (!$type instanceof \ReflectionNamedType || $value === null) |
|
197 | + { |
|
179 | 198 | return $value; |
180 | 199 | } |
181 | 200 | |
@@ -194,7 +213,8 @@ discard block |
||
194 | 213 | |
195 | 214 | private function getPropertyType(\ReflectionProperty $property): \ReflectionNamedType |
196 | 215 | { |
197 | - if (!$property->hasType()) { |
|
216 | + if (!$property->hasType()) |
|
217 | + { |
|
198 | 218 | throw new ConfiguratorException( |
199 | 219 | \sprintf('Please, specify the type for the `%s` property!', $property->getName()) |
200 | 220 | ); |
@@ -202,23 +222,29 @@ discard block |
||
202 | 222 | |
203 | 223 | $type = $property->getType(); |
204 | 224 | |
205 | - if ($type instanceof \ReflectionIntersectionType) { |
|
225 | + if ($type instanceof \ReflectionIntersectionType) |
|
226 | + { |
|
206 | 227 | throw new ConfiguratorException(\sprintf('Invalid type for the `%s` property.', $property->getName())); |
207 | 228 | } |
208 | 229 | |
209 | - if ($type instanceof \ReflectionUnionType) { |
|
210 | - foreach ($type->getTypes() as $type) { |
|
211 | - if ($type instanceof \ReflectionNamedType && $type->isBuiltin()) { |
|
230 | + if ($type instanceof \ReflectionUnionType) |
|
231 | + { |
|
232 | + foreach ($type->getTypes() as $type) |
|
233 | + { |
|
234 | + if ($type instanceof \ReflectionNamedType && $type->isBuiltin()) |
|
235 | + { |
|
212 | 236 | return $type; |
213 | 237 | } |
214 | 238 | } |
215 | 239 | } |
216 | 240 | |
217 | - if (!$type->isBuiltin() && \enum_exists($type->getName())) { |
|
241 | + if (!$type->isBuiltin() && \enum_exists($type->getName())) |
|
242 | + { |
|
218 | 243 | return $type; |
219 | 244 | } |
220 | 245 | |
221 | - if ($type instanceof \ReflectionNamedType && $type->isBuiltin() && $type->getName() !== 'object') { |
|
246 | + if ($type instanceof \ReflectionNamedType && $type->isBuiltin() && $type->getName() !== 'object') |
|
247 | + { |
|
222 | 248 | return $type; |
223 | 249 | } |
224 | 250 |