Passed
Push — master ( 7bd689...ed0e19 )
by butschster
16:50 queued 18s
created
src/Core/tests/Internal/Proxy/ProxyClassRendererTest.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,22 +72,28 @@
 block discarded – undo
72 72
 
73 73
     public static function provideRenderMethod(): iterable
74 74
     {
75
-        $class = new class {
75
+        $class = new class
76
+        {
76 77
             public const INT_CONST = 42;
77 78
 
78 79
             #[ExpectedAttribute('public function test1(...$variadic)')]
79
-            public function test1(...$variadic) {}
80
+            public function test1(...$variadic)
81
+            {
82
+}
80 83
             #[ExpectedAttribute('public function test2(string|int $string = self::INT_CONST): string|int')]
81 84
             public function test2(string|int $string = self::INT_CONST): string|int {}
82 85
             #[ExpectedAttribute('public function test3(object $obj = new \stdClass(new \stdClass(), new \stdClass()))')]
83
-            public function test3(object $obj = new stdClass(new stdClass(), new stdClass())) {}
86
+            public function test3(object $obj = new stdClass(new stdClass(), new stdClass()))
87
+            {
88
+}
84 89
             #[ExpectedAttribute('public function test4(): \\' . ProxyClassRendererTest::class)]
85 90
             public function test4(): ProxyClassRendererTest {}
86 91
             #[ExpectedAttribute('public function &test5(): string')]
87 92
             public function &test5(): string {}
88 93
         };
89 94
 
90
-        foreach ((new \ReflectionClass($class))->getMethods() as $method) {
95
+        foreach ((new \ReflectionClass($class))->getMethods() as $method)
96
+        {
91 97
             $expected = $method->getAttributes(ExpectedAttribute::class)[0]->newInstance();
92 98
 
93 99
             yield [$method, $expected->value];
Please login to merge, or discard this patch.
src/Core/tests/Internal/Proxy/Stub/MockInterfaceImpl.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,8 @@
 block discarded – undo
48 48
 
49 49
     public function concatMultiple(string $prefix, string &...$byLink): array
50 50
     {
51
-        foreach ($byLink as $k => $link) {
51
+        foreach ($byLink as $k => $link)
52
+        {
52 53
             $byLink[$k] = $prefix . $link;
53 54
             unset($link);
54 55
         }
Please login to merge, or discard this patch.
src/Core/tests/Scope/FibersTest.php 1 patch
Braces   +21 added lines, -10 removed lines patch added patch discarded remove patch
@@ -30,7 +30,8 @@  discard block
 block discarded – undo
30 30
 
31 31
         FiberHelper::runInFiber(
32 32
             self::functionScopedTestDataIterator(),
33
-            static function (mixed $suspendValue) {
33
+            static function (mixed $suspendValue)
34
+            {
34 35
                 self::assertNull(ContainerScope::getContainer());
35 36
                 self::assertTrue(\in_array($suspendValue, self::TEST_DATA, true));
36 37
             },
@@ -63,7 +64,8 @@  discard block
 block discarded – undo
63 64
         );
64 65
 
65 66
         self::assertCount(5, $result);
66
-        foreach ($result as $suspendValue) {
67
+        foreach ($result as $suspendValue)
68
+        {
67 69
             self::assertSame(self::TEST_DATA, $suspendValue);
68 70
         }
69 71
     }
@@ -81,7 +83,8 @@  discard block
 block discarded – undo
81 83
         );
82 84
 
83 85
         self::assertCount(2, $result);
84
-        foreach ($result as $suspendValue) {
86
+        foreach ($result as $suspendValue)
87
+        {
85 88
             self::assertSame(self::TEST_DATA, $suspendValue);
86 89
         }
87 90
     }
@@ -92,7 +95,8 @@  discard block
 block discarded – undo
92 95
         $this->expectExceptionMessage('test');
93 96
 
94 97
         FiberHelper::runInFiber(
95
-            static function () {
98
+            static function ()
99
+            {
96 100
                 return (new Container())->runScoped(
97 101
                     function (): string {
98 102
                         $result = '';
@@ -114,15 +118,19 @@  discard block
 block discarded – undo
114 118
     public function testCatchThrownException(): void
115 119
     {
116 120
         $result = FiberHelper::runInFiber(
117
-            static function () {
121
+            static function ()
122
+            {
118 123
                 return (new Container())->runScoped(
119 124
                     function (): string {
120 125
                         $result = '';
121 126
                         $result .= Fiber::suspend('foo');
122 127
                         $result .= Fiber::suspend('bar');
123
-                        try {
128
+                        try
129
+                        {
124 130
                             $result .= Fiber::suspend('error');
125
-                        } catch (\Throwable $e) {
131
+                        }
132
+                        catch (\Throwable $e)
133
+                        {
126 134
                             $result .= $e->getMessage();
127 135
                         }
128 136
                         $result .= Fiber::suspend('baz');
@@ -160,20 +168,23 @@  discard block
 block discarded – undo
160 168
             $c1 = $container ?? new Container();
161 169
             $c1->bindSingleton('resource', new stdClass());
162 170
 
163
-            $result = $c1->runScoped(static function (Container $c2) use ($load) {
171
+            $result = $c1->runScoped(static function (Container $c2) use ($load)
172
+            {
164 173
                 // check local binding
165 174
                 self::assertTrue($c2->has('foo'));
166 175
                 self::assertInstanceOf(DateTime::class, $c2->get('foo'));
167 176
 
168 177
                 return $c2->runScoped(
169
-                    static function (ContainerInterface $c3) use ($load) {
178
+                    static function (ContainerInterface $c3) use ($load)
179
+                    {
170 180
                         // check local binding
171 181
                         self::assertTrue($c3->has('bar'));
172 182
 
173 183
                         $resource = $c3->get('resource');
174 184
                         self::assertInstanceOf(DateTimeImmutable::class, $c3->get('bar'));
175 185
                         self::assertInstanceOf(stdClass::class, $resource);
176
-                        foreach (self::TEST_DATA as $key => $value) {
186
+                        foreach (self::TEST_DATA as $key => $value)
187
+                        {
177 188
                             $resource->$key = $value;
178 189
                             $load === null or $load();
179 190
                             Fiber::suspend($value);
Please login to merge, or discard this patch.
src/Core/tests/Scope/FiberHelper.php 1 patch
Braces   +26 added lines, -12 removed lines patch added patch discarded remove patch
@@ -22,11 +22,16 @@  discard block
 block discarded – undo
22 22
     {
23 23
         $fiber = new Fiber($callable);
24 24
         $value = $fiber->start();
25
-        while (!$fiber->isTerminated()) {
26
-            if ($check !== null) {
27
-                try {
25
+        while (!$fiber->isTerminated())
26
+        {
27
+            if ($check !== null)
28
+            {
29
+                try
30
+                {
28 31
                     $value = $check($value);
29
-                } catch (\Throwable $e) {
32
+                }
33
+                catch (\Throwable $e)
34
+                {
30 35
                     $value = $fiber->throw($e);
31 36
                     continue;
32 37
                 }
@@ -50,14 +55,17 @@  discard block
 block discarded – undo
50 55
         /** Values that were suspended by the fiber. */
51 56
         $suspends = [];
52 57
         $results = [];
53
-        foreach ($callables as $key => $callable) {
54
-            $fiberGenerators[$key] = (static function () use ($callable) {
58
+        foreach ($callables as $key => $callable)
59
+        {
60
+            $fiberGenerators[$key] = (static function () use ($callable)
61
+            {
55 62
                 $fiber = new Fiber($callable);
56 63
                 // Get ready
57 64
                 yield null;
58 65
 
59 66
                 $value = yield $fiber->start();
60
-                while (!$fiber->isTerminated()) {
67
+                while (!$fiber->isTerminated())
68
+                {
61 69
                     $value = yield $fiber->resume($value);
62 70
                 }
63 71
                 return $fiber->getReturn();
@@ -67,15 +75,21 @@  discard block
 block discarded – undo
67 75
         }
68 76
 
69 77
 
70
-        while ($fiberGenerators !== []) {
71
-            foreach ($fiberGenerators as $key => $generator) {
72
-                try {
78
+        while ($fiberGenerators !== [])
79
+        {
80
+            foreach ($fiberGenerators as $key => $generator)
81
+            {
82
+                try
83
+                {
73 84
                     $suspends[$key] = $generator->send($suspends[$key]);
74
-                    if (!$generator->valid()) {
85
+                    if (!$generator->valid())
86
+                    {
75 87
                         $results[$key] = $generator->getReturn();
76 88
                         unset($fiberGenerators[$key]);
77 89
                     }
78
-                } catch (\Throwable $e) {
90
+                }
91
+                catch (\Throwable $e)
92
+                {
79 93
                     unset($fiberGenerators[$key]);
80 94
                     $results[$key] = $e;
81 95
                 }
Please login to merge, or discard this patch.
src/Core/tests/Scope/UseCaseTest.php 1 patch
Braces   +18 added lines, -9 removed lines patch added patch discarded remove patch
@@ -28,7 +28,8 @@  discard block
 block discarded – undo
28 28
         $root = new Container();
29 29
         $root->bind('foo', SampleClass::class);
30 30
 
31
-        $root->runScoped(function (ContainerInterface $c1) {
31
+        $root->runScoped(function (ContainerInterface $c1)
32
+        {
32 33
             $c1->get('foo');
33 34
         }, bindings: ['foo' => SampleClass::class]);
34 35
 
@@ -61,7 +62,8 @@  discard block
 block discarded – undo
61 62
     {
62 63
         $root = new Container();
63 64
 
64
-        $root->runScoped(function (ContainerInterface $c1) use ($theSame, $alias) {
65
+        $root->runScoped(function (ContainerInterface $c1) use ($theSame, $alias)
66
+        {
65 67
             $obj1 = $c1->get($alias);
66 68
             $obj2 = $c1->get($alias);
67 69
 
@@ -86,14 +88,16 @@  discard block
 block discarded – undo
86 88
     {
87 89
         $root = new Container();
88 90
 
89
-        $root->runScoped(function (ContainerInterface $c1) use ($root) {
91
+        $root->runScoped(function (ContainerInterface $c1) use ($root)
92
+        {
90 93
             $obj1 = $c1->get('foo');
91 94
             $this->weakMap->offsetSet($obj1, true);
92 95
 
93 96
             self::assertNotSame($root, $c1);
94 97
             self::assertInstanceOf(stdClass::class, $obj1);
95 98
 
96
-            $c1->runScoped(function (ContainerInterface $c2) use ($root, $c1, $obj1) {
99
+            $c1->runScoped(function (ContainerInterface $c2) use ($root, $c1, $obj1)
100
+            {
97 101
                 $obj2 = $c2->get('foo');
98 102
                 $this->weakMap->offsetSet($obj2, true);
99 103
 
@@ -122,14 +126,16 @@  discard block
 block discarded – undo
122 126
         $root->bindSingleton('bar', [Factory::class, 'makeStdClass']);
123 127
         $root->bind(stdClass::class, new stdClass());
124 128
 
125
-        $root->runScoped(function (ContainerInterface $c1) use ($root) {
129
+        $root->runScoped(function (ContainerInterface $c1) use ($root)
130
+        {
126 131
             $obj1 = $c1->get('foo');
127 132
             $this->weakMap->offsetSet($obj1, true);
128 133
 
129 134
             self::assertInstanceOf(stdClass::class, $obj1);
130 135
             // Singleton must be the same
131 136
             self::assertSame($c1->get('bar'), $root->get('bar'));
132
-            $c1->runScoped(function (ContainerInterface $c2) use ($root, $obj1) {
137
+            $c1->runScoped(function (ContainerInterface $c2) use ($root, $obj1)
138
+            {
133 139
                 $obj2 = $c2->get('foo');
134 140
 
135 141
                 self::assertInstanceOf(stdClass::class, $obj2);
@@ -262,7 +268,8 @@  discard block
 block discarded – undo
262 268
     {
263 269
         $root = new Container();
264 270
 
265
-        $root->invoke(static function () use ($root) {
271
+        $root->invoke(static function () use ($root)
272
+        {
266 273
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
267 274
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
268 275
         });
@@ -271,7 +278,8 @@  discard block
 block discarded – undo
271 278
     public function testRegisterContainerOnGet(): void
272 279
     {
273 280
         $root = new Container();
274
-        $root->bind('foo', function () use ($root) {
281
+        $root->bind('foo', function () use ($root)
282
+        {
275 283
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
276 284
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
277 285
         });
@@ -282,7 +290,8 @@  discard block
 block discarded – undo
282 290
     public function testRegisterContainerOnMake(): void
283 291
     {
284 292
         $root = new Container();
285
-        $root->bind('foo', function () use ($root) {
293
+        $root->bind('foo', function () use ($root)
294
+        {
286 295
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
287 296
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
288 297
         });
Please login to merge, or discard this patch.
src/Core/src/Container.php 1 patch
Braces   +46 added lines, -21 removed lines patch added patch discarded remove patch
@@ -170,23 +170,29 @@  discard block
 block discarded – undo
170 170
      */
171 171
     public function runScope(Scope|array $bindings, callable $scope): mixed
172 172
     {
173
-        if (!\is_array($bindings)) {
173
+        if (!\is_array($bindings))
174
+        {
174 175
             return $this->runIsolatedScope($bindings, $scope);
175 176
         }
176 177
 
177 178
         $binds = &$this->state->bindings;
178 179
         $singletons = &$this->state->singletons;
179 180
         $cleanup = $previous = $prevSin = [];
180
-        foreach ($bindings as $alias => $resolver) {
181
+        foreach ($bindings as $alias => $resolver)
182
+        {
181 183
             // Store previous bindings
182
-            if (isset($binds[$alias])) {
184
+            if (isset($binds[$alias]))
185
+            {
183 186
                 $previous[$alias] = $binds[$alias];
184
-            } else {
187
+            }
188
+            else
189
+            {
185 190
                 // Store bindings to be removed
186 191
                 $cleanup[] = $alias;
187 192
             }
188 193
             // Store previous singletons
189
-            if (isset($singletons[$alias])) {
194
+            if (isset($singletons[$alias]))
195
+            {
190 196
                 $prevSin[$alias] = $singletons[$alias];
191 197
                 unset($singletons[$alias]);
192 198
             }
@@ -194,21 +200,27 @@  discard block
 block discarded – undo
194 200
             $this->binder->bind($alias, $resolver);
195 201
         }
196 202
 
197
-        try {
203
+        try
204
+        {
198 205
             return ContainerScope::getContainer() !== $this
199 206
                 ? ContainerScope::runScope($this, $scope)
200 207
                 : $scope($this);
201
-        } finally {
208
+        }
209
+        finally
210
+        {
202 211
             // Remove new bindings
203
-            foreach ($cleanup as $alias) {
212
+            foreach ($cleanup as $alias)
213
+            {
204 214
                 unset($binds[$alias], $singletons[$alias]);
205 215
             }
206 216
             // Restore previous bindings
207
-            foreach ($previous as $alias => $resolver) {
217
+            foreach ($previous as $alias => $resolver)
218
+            {
208 219
                 $binds[$alias] = $resolver;
209 220
             }
210 221
             // Restore singletons
211
-            foreach ($prevSin as $alias => $instance) {
222
+            foreach ($prevSin as $alias => $instance)
223
+            {
212 224
                 $singletons[$alias] = $instance;
213 225
             }
214 226
         }
@@ -265,7 +277,8 @@  discard block
 block discarded – undo
265 277
      */
266 278
     public function bindSingleton(string $alias, string|array|callable|object $resolver, bool $force = true): void
267 279
     {
268
-        if ($force) {
280
+        if ($force)
281
+        {
269 282
             $this->binder->removeBinding($alias);
270 283
         }
271 284
 
@@ -336,8 +349,10 @@  discard block
 block discarded – undo
336 349
         ]);
337 350
 
338 351
         // Create container services
339
-        foreach ($container->config as $property => $class) {
340
-            if (\property_exists($container, $property)) {
352
+        foreach ($container->config as $property => $class)
353
+        {
354
+            if (\property_exists($container, $property))
355
+            {
341 356
                 $container->$property = $constructor->get($property, $class);
342 357
             }
343 358
         }
@@ -351,7 +366,8 @@  discard block
 block discarded – undo
351 366
     private function closeScope(): void
352 367
     {
353 368
         /** @psalm-suppress RedundantPropertyInitializationCheck */
354
-        if (!isset($this->scope)) {
369
+        if (!isset($this->scope))
370
+        {
355 371
             $this->destruct();
356 372
             return;
357 373
         }
@@ -360,10 +376,14 @@  discard block
 block discarded – undo
360 376
 
361 377
         // Run finalizers
362 378
         $errors = [];
363
-        foreach ($this->state->finalizers as $finalizer) {
364
-            try {
379
+        foreach ($this->state->finalizers as $finalizer)
380
+        {
381
+            try
382
+            {
365 383
                 $this->invoker->invoke($finalizer);
366
-            } catch (\Throwable $e) {
384
+            }
385
+            catch (\Throwable $e)
386
+            {
367 387
                 $errors[] = $e;
368 388
             }
369 389
         }
@@ -372,7 +392,8 @@  discard block
 block discarded – undo
372 392
         $this->destruct();
373 393
 
374 394
         // Throw collected errors
375
-        if ($errors !== []) {
395
+        if ($errors !== [])
396
+        {
376 397
             throw new FinalizersException($scopeName, $errors);
377 398
         }
378 399
     }
@@ -394,18 +415,22 @@  discard block
 block discarded – undo
394 415
         $container->scope->setParent($this, $this->scope);
395 416
 
396 417
         // Add specific bindings
397
-        foreach ($config->bindings as $alias => $resolver) {
418
+        foreach ($config->bindings as $alias => $resolver)
419
+        {
398 420
             $container->binder->bind($alias, $resolver);
399 421
         }
400 422
 
401 423
         return ContainerScope::runScope(
402 424
             $container,
403 425
             static function (self $container) use ($config, $closure): mixed {
404
-                try {
426
+                try
427
+                {
405 428
                     return $config->autowire
406 429
                         ? $container->invoke($closure)
407 430
                         : $closure($container);
408
-                } finally {
431
+                }
432
+                finally
433
+                {
409 434
                     $container->closeScope();
410 435
                 }
411 436
             }
Please login to merge, or discard this patch.
src/Core/tests/Scope/SideEffectTest.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -23,10 +23,12 @@  discard block
 block discarded – undo
23 23
         $root = new Container();
24 24
         $root->bind(LoggerInterface::class, KVLogger::class);
25 25
 
26
-        $root->runScope(new Scope(), static function (Container $c1) {
26
+        $root->runScope(new Scope(), static function (Container $c1)
27
+        {
27 28
             $c1->bind(LoggerInterface::class, FileLogger::class);
28 29
 
29
-            $c1->runScope(new Scope(), static function (LoggerCarrier $carrier, LoggerInterface $logger) {
30
+            $c1->runScope(new Scope(), static function (LoggerCarrier $carrier, LoggerInterface $logger)
31
+            {
30 32
                 // from the $root container
31 33
                 self::assertInstanceOf(KVLogger::class, $carrier->logger);
32 34
                 // from the $c1 container
@@ -40,7 +42,8 @@  discard block
 block discarded – undo
40 42
         $root = new Container();
41 43
         $root->bind(LoggerInterface::class, KVLogger::class);
42 44
 
43
-        $root->runScope(new Scope(), static function (Container $c1) {
45
+        $root->runScope(new Scope(), static function (Container $c1)
46
+        {
44 47
             $c1->bind(LoggerInterface::class, FileLogger::class);
45 48
 
46 49
             self::assertInstanceOf(
Please login to merge, or discard this patch.
src/Core/tests/Internal/Proxy/ProxyTest.php 1 patch
Braces   +14 added lines, -7 removed lines patch added patch discarded remove patch
@@ -32,7 +32,8 @@  discard block
 block discarded – undo
32 32
         $root->invoke(static function (
33 33
             #[Proxy] MockInterface $mock,
34 34
             #[Proxy(/*proxyOverloads: true*/)] EmptyInterface $empty,
35
-        ) use ($var) {
35
+        ) use ($var)
36
+        {
36 37
             /** @var MockInterfaceImpl $proxy */
37 38
             $proxy = $$var;
38 39
             $proxy->bar(name: 'foo'); // Possible to run
@@ -49,7 +50,8 @@  discard block
 block discarded – undo
49 50
 
50 51
         self::expectExceptionMessageMatches('/Call to undefined method/i');
51 52
 
52
-        $root->invoke(static function (#[Proxy] EmptyInterface $proxy) {
53
+        $root->invoke(static function (#[Proxy] EmptyInterface $proxy)
54
+        {
53 55
             $proxy->bar(name: 'foo'); // Possible to run
54 56
         });
55 57
     }
@@ -66,7 +68,8 @@  discard block
 block discarded – undo
66 68
         $root->invoke(static function (
67 69
             #[Proxy] MockInterface $mock,
68 70
             #[Proxy(/*proxyOverloads: true*/)] EmptyInterface $empty,
69
-        ) use ($var) {
71
+        ) use ($var)
72
+        {
70 73
             /** @var MockInterfaceImpl $proxy */
71 74
             $proxy = $$var;
72 75
             self::assertSame(['foo', 'bar', 'baz', 69], $proxy->extra('foo', 'bar', 'baz', 69));
@@ -88,7 +91,8 @@  discard block
 block discarded – undo
88 91
         $root->invoke(static function (
89 92
             #[Proxy] MockInterface $mock,
90 93
             #[Proxy(/*proxyOverloads: true*/)] EmptyInterface $empty,
91
-        ) use ($var) {
94
+        ) use ($var)
95
+        {
92 96
             /** @var MockInterfaceImpl $proxy */
93 97
             $proxy = $$var;
94 98
             self::assertSame(['foo', 'bar', 'baz', 69], $proxy->extraVariadic('foo', 'bar', 'baz', 69));
@@ -112,7 +116,8 @@  discard block
 block discarded – undo
112 116
         $root->bindSingleton(MockInterface::class, Stub\MockInterfaceImpl::class);
113 117
         $root->bindSingleton(EmptyInterface::class, Stub\MockInterfaceImpl::class);
114 118
 
115
-        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var) {
119
+        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var)
120
+        {
116 121
             /** @var MockInterfaceImpl $proxy */
117 122
             $proxy = $$var;
118 123
             $str = 'bar';
@@ -134,7 +139,8 @@  discard block
 block discarded – undo
134 139
         $root->bindSingleton(MockInterface::class, Stub\MockInterfaceImpl::class);
135 140
         $root->bindSingleton(EmptyInterface::class, Stub\MockInterfaceImpl::class);
136 141
 
137
-        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var) {
142
+        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var)
143
+        {
138 144
             /** @var MockInterfaceImpl $proxy */
139 145
             $proxy = $$var;
140 146
 
@@ -159,7 +165,8 @@  discard block
 block discarded – undo
159 165
         $root->bindSingleton(MockInterface::class, Stub\MockInterfaceImpl::class);
160 166
         $root->bindSingleton(EmptyInterface::class, Stub\MockInterfaceImpl::class);
161 167
 
162
-        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var) {
168
+        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var)
169
+        {
163 170
             /** @var MockInterfaceImpl $proxy */
164 171
             $proxy = $$var;
165 172
             $str1 = 'bar';
Please login to merge, or discard this patch.
src/Core/src/Internal/Resolver.php 1 patch
Braces   +81 added lines, -38 removed lines patch added patch discarded remove patch
@@ -53,7 +53,8 @@  discard block
 block discarded – undo
53 53
     ): array {
54 54
         $state = new ResolvingState($reflection, $parameters);
55 55
 
56
-        foreach ($reflection->getParameters() as $parameter) {
56
+        foreach ($reflection->getParameters() as $parameter)
57
+        {
57 58
             $this->resolveParameter($parameter, $state, $validate)
58 59
             or
59 60
             throw new ArgumentResolvingException($reflection, $parameter->getName());
@@ -67,47 +68,59 @@  discard block
 block discarded – undo
67 68
         $positional = true;
68 69
         $variadic = false;
69 70
         $parameters = $reflection->getParameters();
70
-        if (\count($parameters) === 0) {
71
+        if (\count($parameters) === 0)
72
+        {
71 73
             return;
72 74
         }
73 75
 
74 76
         $parameter = null;
75
-        while (\count($parameters) > 0 || \count($arguments) > 0) {
77
+        while (\count($parameters) > 0 || \count($arguments) > 0)
78
+        {
76 79
             // get related argument value
77 80
             $key = \key($arguments);
78 81
 
79 82
             // For a variadic parameter it's no sense - named or positional argument will be sent
80 83
             // But you can't send positional argument after named in any case
81
-            if (\is_int($key) && !$positional) {
84
+            if (\is_int($key) && !$positional)
85
+            {
82 86
                 throw new PositionalArgumentException($reflection, $key);
83 87
             }
84 88
 
85 89
             $positional = $positional && \is_int($key);
86 90
 
87
-            if (!$variadic) {
91
+            if (!$variadic)
92
+            {
88 93
                 $parameter = \array_shift($parameters);
89 94
                 $variadic = $parameter?->isVariadic() ?? false;
90 95
             }
91 96
 
92
-            if ($parameter === null) {
97
+            if ($parameter === null)
98
+            {
93 99
                 throw new UnknownParameterException($reflection, $key);
94 100
             }
95 101
             $name = $parameter->getName();
96 102
 
97
-            if (($positional || $variadic) && $key !== null) {
103
+            if (($positional || $variadic) && $key !== null)
104
+            {
98 105
                 /** @psalm-suppress ReferenceReusedFromConfusingScope */
99 106
                 $value = \array_shift($arguments);
100
-            } elseif ($key === null || !\array_key_exists($name, $arguments)) {
101
-                if ($parameter->isOptional()) {
107
+            }
108
+            elseif ($key === null || !\array_key_exists($name, $arguments))
109
+            {
110
+                if ($parameter->isOptional())
111
+                {
102 112
                     continue;
103 113
                 }
104 114
                 throw new MissingRequiredArgumentException($reflection, $name);
105
-            } else {
115
+            }
116
+            else
117
+            {
106 118
                 $value = &$arguments[$name];
107 119
                 unset($arguments[$name]);
108 120
             }
109 121
 
110
-            if (!$this->validateValueToParameter($parameter, $value)) {
122
+            if (!$this->validateValueToParameter($parameter, $value))
123
+            {
111 124
                 throw new InvalidArgumentException($reflection, $name);
112 125
             }
113 126
         }
@@ -115,7 +128,8 @@  discard block
 block discarded – undo
115 128
 
116 129
     private function validateValueToParameter(ReflectionParameter $parameter, mixed $value): bool
117 130
     {
118
-        if (!$parameter->hasType() || ($parameter->allowsNull() && $value === null)) {
131
+        if (!$parameter->hasType() || ($parameter->allowsNull() && $value === null))
132
+        {
119 133
             return true;
120 134
         }
121 135
         $type = $parameter->getType();
@@ -126,17 +140,21 @@  discard block
 block discarded – undo
126 140
             $type instanceof ReflectionIntersectionType => [false, $type->getTypes()],
127 141
         };
128 142
 
129
-        foreach ($types as $t) {
143
+        foreach ($types as $t)
144
+        {
130 145
             \assert($t instanceof ReflectionNamedType);
131
-            if (!$this->validateValueNamedType($t, $value)) {
146
+            if (!$this->validateValueNamedType($t, $value))
147
+            {
132 148
                 // If it is TypeIntersection
133
-                if ($or) {
149
+                if ($or)
150
+                {
134 151
                     continue;
135 152
                 }
136 153
                 return false;
137 154
             }
138 155
             // If it is not type intersection then we can skip that value after first successful check
139
-            if ($or) {
156
+            if ($or)
157
+            {
140 158
                 return true;
141 159
             }
142 160
         }
@@ -151,7 +169,8 @@  discard block
 block discarded – undo
151 169
     {
152 170
         $name = $type->getName();
153 171
 
154
-        if ($type->isBuiltin()) {
172
+        if ($type->isBuiltin())
173
+        {
155 174
             return match ($name) {
156 175
                 'mixed' => true,
157 176
                 'string' => \is_string($value),
@@ -184,13 +203,18 @@  discard block
 block discarded – undo
184 203
 
185 204
         // Try to resolve parameter by name
186 205
         $res = $state->resolveParameterByNameOrPosition($param, $isVariadic);
187
-        if ($res !== [] || $isVariadic) {
206
+        if ($res !== [] || $isVariadic)
207
+        {
188 208
             // validate
189
-            if ($isVariadic) {
190
-                foreach ($res as $k => &$v) {
209
+            if ($isVariadic)
210
+            {
211
+                foreach ($res as $k => &$v)
212
+                {
191 213
                     $this->processArgument($state, $v, validateWith: $validate ? $param : null, key: $k);
192 214
                 }
193
-            } else {
215
+            }
216
+            else
217
+            {
194 218
                 $this->processArgument($state, $res[0], validateWith: $validate ? $param : null);
195 219
             }
196 220
 
@@ -198,18 +222,22 @@  discard block
 block discarded – undo
198 222
         }
199 223
 
200 224
         $error = null;
201
-        while ($hasType) {
225
+        while ($hasType)
226
+        {
202 227
             /** @var ReflectionIntersectionType|ReflectionUnionType|ReflectionNamedType $refType */
203 228
             $refType = $param->getType();
204 229
 
205
-            if ($refType::class === ReflectionNamedType::class) {
206
-                if ($refType->isBuiltin()) {
230
+            if ($refType::class === ReflectionNamedType::class)
231
+            {
232
+                if ($refType->isBuiltin())
233
+                {
207 234
                     break;
208 235
                 }
209 236
 
210 237
                 if (\interface_exists($refType->getName()) && !empty(
211 238
                     $attrs = $param->getAttributes(ProxyAttribute::class)
212
-                )) {
239
+                ))
240
+                {
213 241
                     $proxy = Proxy::create(
214 242
                         new \ReflectionClass($refType->getName()),
215 243
                         $param,
@@ -219,23 +247,33 @@  discard block
 block discarded – undo
219 247
                     return true;
220 248
                 }
221 249
 
222
-                try {
223
-                    if ($this->resolveObject($state, $refType, $param, $validate)) {
250
+                try
251
+                {
252
+                    if ($this->resolveObject($state, $refType, $param, $validate))
253
+                    {
224 254
                         return true;
225 255
                     }
226
-                } catch (Throwable $e) {
256
+                }
257
+                catch (Throwable $e)
258
+                {
227 259
                     $error = $e;
228 260
                 }
229 261
                 break;
230 262
             }
231 263
 
232
-            if ($refType::class === ReflectionUnionType::class) {
233
-                foreach ($refType->getTypes() as $namedType) {
234
-                    try {
235
-                        if (!$namedType->isBuiltin() && $this->resolveObject($state, $namedType, $param, $validate)) {
264
+            if ($refType::class === ReflectionUnionType::class)
265
+            {
266
+                foreach ($refType->getTypes() as $namedType)
267
+                {
268
+                    try
269
+                    {
270
+                        if (!$namedType->isBuiltin() && $this->resolveObject($state, $namedType, $param, $validate))
271
+                        {
236 272
                             return true;
237 273
                         }
238
-                    } catch (Throwable $e) {
274
+                    }
275
+                    catch (Throwable $e)
276
+                    {
239 277
                         $error = $e;
240 278
                     }
241 279
                 }
@@ -245,19 +283,22 @@  discard block
 block discarded – undo
245 283
             throw new UnsupportedTypeException($param->getDeclaringFunction(), $param->getName());
246 284
         }
247 285
 
248
-        if ($param->isDefaultValueAvailable()) {
286
+        if ($param->isDefaultValueAvailable())
287
+        {
249 288
             $argument = $param->getDefaultValue();
250 289
             $this->processArgument($state, $argument);
251 290
             return true;
252 291
         }
253 292
 
254
-        if ($hasType && $param->allowsNull()) {
293
+        if ($hasType && $param->allowsNull())
294
+        {
255 295
             $argument = null;
256 296
             $this->processArgument($state, $argument);
257 297
             return true;
258 298
         }
259 299
 
260
-        if ($error === null) {
300
+        if ($error === null)
301
+        {
261 302
             return false;
262 303
         }
263 304
 
@@ -298,12 +339,14 @@  discard block
 block discarded – undo
298 339
         int|string $key = null
299 340
     ): void {
300 341
         // Resolve Autowire objects
301
-        if ($value instanceof Autowire) {
342
+        if ($value instanceof Autowire)
343
+        {
302 344
             $value = $value->resolve($this->factory);
303 345
         }
304 346
 
305 347
         // Validation
306
-        if ($validateWith !== null && !$this->validateValueToParameter($validateWith, $value)) {
348
+        if ($validateWith !== null && !$this->validateValueToParameter($validateWith, $value))
349
+        {
307 350
             throw new InvalidArgumentException(
308 351
                 $validateWith->getDeclaringFunction(),
309 352
                 $validateWith->getName()
Please login to merge, or discard this patch.