@@ -22,11 +22,11 @@ discard block |
||
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 | + if ($check !== null){ |
|
27 | + try{ |
|
28 | 28 | $value = $check($value); |
29 | - } catch (\Throwable $e) { |
|
29 | + }catch (\Throwable $e){ |
|
30 | 30 | $value = $fiber->throw($e); |
31 | 31 | continue; |
32 | 32 | } |
@@ -50,14 +50,14 @@ discard block |
||
50 | 50 | /** Values that were suspended by the fiber. */ |
51 | 51 | $suspends = []; |
52 | 52 | $results = []; |
53 | - foreach ($callables as $key => $callable) { |
|
53 | + foreach ($callables as $key => $callable){ |
|
54 | 54 | $fiberGenerators[$key] = (static function () use ($callable) { |
55 | 55 | $fiber = new Fiber($callable); |
56 | 56 | // Get ready |
57 | 57 | yield null; |
58 | 58 | |
59 | 59 | $value = yield $fiber->start(); |
60 | - while (!$fiber->isTerminated()) { |
|
60 | + while (!$fiber->isTerminated()){ |
|
61 | 61 | $value = yield $fiber->resume($value); |
62 | 62 | } |
63 | 63 | return $fiber->getReturn(); |
@@ -67,15 +67,15 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | |
70 | - while ($fiberGenerators !== []) { |
|
71 | - foreach ($fiberGenerators as $key => $generator) { |
|
72 | - try { |
|
70 | + while ($fiberGenerators !== []){ |
|
71 | + foreach ($fiberGenerators as $key => $generator){ |
|
72 | + try{ |
|
73 | 73 | $suspends[$key] = $generator->send($suspends[$key]); |
74 | - if (!$generator->valid()) { |
|
74 | + if (!$generator->valid()){ |
|
75 | 75 | $results[$key] = $generator->getReturn(); |
76 | 76 | unset($fiberGenerators[$key]); |
77 | 77 | } |
78 | - } catch (\Throwable $e) { |
|
78 | + }catch (\Throwable $e){ |
|
79 | 79 | unset($fiberGenerators[$key]); |
80 | 80 | $results[$key] = $e; |
81 | 81 | } |
@@ -22,11 +22,16 @@ discard block |
||
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 |
||
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 |
||
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 | } |
@@ -28,7 +28,8 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | }); |
@@ -23,6 +23,6 @@ |
||
23 | 23 | public readonly ?string $name = null, |
24 | 24 | public readonly array $bindings = [], |
25 | 25 | public readonly bool $autowire = true, |
26 | - ) { |
|
26 | + ){ |
|
27 | 27 | } |
28 | 28 | } |
@@ -170,23 +170,29 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -47,11 +47,11 @@ discard block |
||
47 | 47 | public const DEFAULT_ROOT_SCOPE_NAME = 'root'; |
48 | 48 | |
49 | 49 | private Internal\State $state; |
50 | - private ResolverInterface|Internal\Resolver $resolver; |
|
51 | - private FactoryInterface|Internal\Factory $factory; |
|
52 | - private ContainerInterface|Internal\Container $container; |
|
53 | - private BinderInterface|Internal\Binder $binder; |
|
54 | - private InvokerInterface|Internal\Invoker $invoker; |
|
50 | + private ResolverInterface | Internal\Resolver $resolver; |
|
51 | + private FactoryInterface | Internal\Factory $factory; |
|
52 | + private ContainerInterface | Internal\Container $container; |
|
53 | + private BinderInterface | Internal\Binder $binder; |
|
54 | + private InvokerInterface | Internal\Invoker $invoker; |
|
55 | 55 | private Internal\Scope $scope; |
56 | 56 | |
57 | 57 | /** |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | public function __construct( |
61 | 61 | private Config $config = new Config(), |
62 | 62 | ?string $scopeName = self::DEFAULT_ROOT_SCOPE_NAME, |
63 | - ) { |
|
63 | + ){ |
|
64 | 64 | $this->initServices($this, $scopeName); |
65 | 65 | |
66 | 66 | /** @psalm-suppress RedundantPropertyInitializationCheck */ |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * @throws \Throwable |
113 | 113 | * @psalm-suppress TooManyArguments |
114 | 114 | */ |
115 | - public function make(string $alias, array $parameters = [], \Stringable|string|null $context = null): mixed |
|
115 | + public function make(string $alias, array $parameters = [], \Stringable | string | null $context = null): mixed |
|
116 | 116 | { |
117 | 117 | return ContainerScope::getContainer() === $this |
118 | 118 | ? $this->factory->make($alias, $parameters, $context) |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | * @throws \Throwable |
139 | 139 | * @psalm-suppress TooManyArguments |
140 | 140 | */ |
141 | - public function get(string|Autowire $id, \Stringable|string|null $context = null): mixed |
|
141 | + public function get(string | Autowire $id, \Stringable | string | null $context = null): mixed |
|
142 | 142 | { |
143 | 143 | return ContainerScope::getContainer() === $this |
144 | 144 | ? $this->container->get($id, $context) |
@@ -168,25 +168,25 @@ discard block |
||
168 | 168 | /** |
169 | 169 | * @throws \Throwable |
170 | 170 | */ |
171 | - public function runScope(Scope|array $bindings, callable $scope): mixed |
|
171 | + public function runScope(Scope | array $bindings, callable $scope): mixed |
|
172 | 172 | { |
173 | - if (!\is_array($bindings)) { |
|
173 | + if (!\is_array($bindings)){ |
|
174 | 174 | return $this->runIsolatedScope($bindings, $scope); |
175 | 175 | } |
176 | 176 | |
177 | 177 | $binds = &$this->state->bindings; |
178 | 178 | $singletons = &$this->state->singletons; |
179 | 179 | $cleanup = $previous = $prevSin = []; |
180 | - foreach ($bindings as $alias => $resolver) { |
|
180 | + foreach ($bindings as $alias => $resolver){ |
|
181 | 181 | // Store previous bindings |
182 | - if (isset($binds[$alias])) { |
|
182 | + if (isset($binds[$alias])){ |
|
183 | 183 | $previous[$alias] = $binds[$alias]; |
184 | - } else { |
|
184 | + }else{ |
|
185 | 185 | // Store bindings to be removed |
186 | 186 | $cleanup[] = $alias; |
187 | 187 | } |
188 | 188 | // Store previous singletons |
189 | - if (isset($singletons[$alias])) { |
|
189 | + if (isset($singletons[$alias])){ |
|
190 | 190 | $prevSin[$alias] = $singletons[$alias]; |
191 | 191 | unset($singletons[$alias]); |
192 | 192 | } |
@@ -194,21 +194,21 @@ discard block |
||
194 | 194 | $this->binder->bind($alias, $resolver); |
195 | 195 | } |
196 | 196 | |
197 | - try { |
|
197 | + try{ |
|
198 | 198 | return ContainerScope::getContainer() !== $this |
199 | 199 | ? ContainerScope::runScope($this, $scope) |
200 | 200 | : $scope($this); |
201 | - } finally { |
|
201 | + }finally{ |
|
202 | 202 | // Remove new bindings |
203 | - foreach ($cleanup as $alias) { |
|
203 | + foreach ($cleanup as $alias){ |
|
204 | 204 | unset($binds[$alias], $singletons[$alias]); |
205 | 205 | } |
206 | 206 | // Restore previous bindings |
207 | - foreach ($previous as $alias => $resolver) { |
|
207 | + foreach ($previous as $alias => $resolver){ |
|
208 | 208 | $binds[$alias] = $resolver; |
209 | 209 | } |
210 | 210 | // Restore singletons |
211 | - foreach ($prevSin as $alias => $instance) { |
|
211 | + foreach ($prevSin as $alias => $instance){ |
|
212 | 212 | $singletons[$alias] = $instance; |
213 | 213 | } |
214 | 214 | } |
@@ -254,9 +254,9 @@ discard block |
||
254 | 254 | * @param bool $force If the value is false, an exception will be thrown when attempting |
255 | 255 | * to bind an already constructed singleton. |
256 | 256 | */ |
257 | - public function bindSingleton(string $alias, string|array|callable|object $resolver, bool $force = true): void |
|
257 | + public function bindSingleton(string $alias, string | array | callable | object $resolver, bool $force = true): void |
|
258 | 258 | { |
259 | - if ($force) { |
|
259 | + if ($force){ |
|
260 | 260 | $this->binder->removeBinding($alias); |
261 | 261 | } |
262 | 262 | |
@@ -327,8 +327,8 @@ discard block |
||
327 | 327 | ]); |
328 | 328 | |
329 | 329 | // Create container services |
330 | - foreach ($container->config as $property => $class) { |
|
331 | - if (\property_exists($container, $property)) { |
|
330 | + foreach ($container->config as $property => $class){ |
|
331 | + if (\property_exists($container, $property)){ |
|
332 | 332 | $container->$property = $constructor->get($property, $class); |
333 | 333 | } |
334 | 334 | } |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | private function closeScope(): void |
343 | 343 | { |
344 | 344 | /** @psalm-suppress RedundantPropertyInitializationCheck */ |
345 | - if (!isset($this->scope)) { |
|
345 | + if (!isset($this->scope)){ |
|
346 | 346 | $this->destruct(); |
347 | 347 | return; |
348 | 348 | } |
@@ -351,10 +351,10 @@ discard block |
||
351 | 351 | |
352 | 352 | // Run finalizers |
353 | 353 | $errors = []; |
354 | - foreach ($this->state->finalizers as $finalizer) { |
|
355 | - try { |
|
354 | + foreach ($this->state->finalizers as $finalizer){ |
|
355 | + try{ |
|
356 | 356 | $this->invoker->invoke($finalizer); |
357 | - } catch (\Throwable $e) { |
|
357 | + }catch (\Throwable $e){ |
|
358 | 358 | $errors[] = $e; |
359 | 359 | } |
360 | 360 | } |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | $this->destruct(); |
364 | 364 | |
365 | 365 | // Throw collected errors |
366 | - if ($errors !== []) { |
|
366 | + if ($errors !== []){ |
|
367 | 367 | throw new FinalizersException($scopeName, $errors); |
368 | 368 | } |
369 | 369 | } |
@@ -385,18 +385,18 @@ discard block |
||
385 | 385 | $container->scope->setParent($this, $this->scope); |
386 | 386 | |
387 | 387 | // Add specific bindings |
388 | - foreach ($config->bindings as $alias => $resolver) { |
|
388 | + foreach ($config->bindings as $alias => $resolver){ |
|
389 | 389 | $container->binder->bind($alias, $resolver); |
390 | 390 | } |
391 | 391 | |
392 | 392 | return ContainerScope::runScope( |
393 | 393 | $container, |
394 | 394 | static function (self $container) use ($config, $closure): mixed { |
395 | - try { |
|
395 | + try{ |
|
396 | 396 | return $config->autowire |
397 | 397 | ? $container->invoke($closure) |
398 | 398 | : $closure($container); |
399 | - } finally { |
|
399 | + }finally{ |
|
400 | 400 | $container->closeScope(); |
401 | 401 | } |
402 | 402 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | // from the current `foo` scope |
41 | 41 | self::assertInstanceOf(KVLogger::class, $logger); |
42 | 42 | |
43 | - for ($i = 0; $i < 10; $i++) { |
|
43 | + for ($i = 0; $i < 10; $i++){ |
|
44 | 44 | // because of proxy |
45 | 45 | self::assertNotInstanceOf(KVLogger::class, $carrier->getLogger()); |
46 | 46 | self::assertSame('kv', $carrier->logger->getName()); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | // from the current `foo` scope |
58 | 58 | self::assertInstanceOf(FileLogger::class, $logger); |
59 | 59 | |
60 | - for ($i = 0; $i < 10; $i++) { |
|
60 | + for ($i = 0; $i < 10; $i++){ |
|
61 | 61 | // because of proxy |
62 | 62 | self::assertNotInstanceOf(FileLogger::class, $carrier->getLogger()); |
63 | 63 | self::assertSame('file', $carrier->logger->getName()); |
@@ -74,8 +74,8 @@ discard block |
||
74 | 74 | $root = new Container(); |
75 | 75 | $root->getBinder('http')->bindSingleton(LoggerInterface::class, KVLogger::class); |
76 | 76 | |
77 | - $root->runScoped(static function (Container $c1) { |
|
78 | - $c1->runScoped(static function (ScopedProxyLoggerCarrier $carrier, ScopedProxyLoggerCarrier $carrier2, LoggerInterface $logger) { |
|
77 | + $root->runScoped(static function (Container $c1){ |
|
78 | + $c1->runScoped(static function (ScopedProxyLoggerCarrier $carrier, ScopedProxyLoggerCarrier $carrier2, LoggerInterface $logger){ |
|
79 | 79 | // from the current `foo` scope |
80 | 80 | self::assertInstanceOf(KVLogger::class, $logger); |
81 | 81 | |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | $root = new Container(); |
95 | 95 | $root->getBinder('foo')->bind(LoggerInterface::class, KVLogger::class); |
96 | 96 | |
97 | - $root->runScoped(static function (Container $c1) { |
|
98 | - $c1->runScoped(static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) { |
|
97 | + $root->runScoped(static function (Container $c1){ |
|
98 | + $c1->runScoped(static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger){ |
|
99 | 99 | // from the current `foo` scope |
100 | 100 | self::assertInstanceOf(KVLogger::class, $logger); |
101 | 101 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | $root = new Container(); |
114 | 114 | $root->getBinder('foo') |
115 | 115 | ->bind(ContextInterface::class, new \Spiral\Core\Config\Injectable( |
116 | - new class implements InjectorInterface { |
|
116 | + new class implements InjectorInterface{ |
|
117 | 117 | public function createInjection(\ReflectionClass $class, mixed $context = null): Context |
118 | 118 | { |
119 | 119 | return new Context($context); |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | } |
122 | 122 | )); |
123 | 123 | |
124 | - $root->runScoped(static function (Container $c1) { |
|
125 | - $c1->runScoped(static function (Container $c, ContextInterface $param) { |
|
124 | + $root->runScoped(static function (Container $c1){ |
|
125 | + $c1->runScoped(static function (Container $c, ContextInterface $param){ |
|
126 | 126 | self::assertInstanceOf(ReflectionParameter::class, $param->value); |
127 | 127 | self::assertSame('param', $param->value->getName()); |
128 | 128 | |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $root = new Container(); |
148 | 148 | $root->getBinder('foo') |
149 | 149 | ->bind(ContextInterface::class, new \Spiral\Core\Config\Injectable( |
150 | - new class implements InjectorInterface { |
|
150 | + new class implements InjectorInterface{ |
|
151 | 151 | public function createInjection(\ReflectionClass $class, mixed $context = null): Context |
152 | 152 | { |
153 | 153 | return new Context($context); |
@@ -156,15 +156,15 @@ discard block |
||
156 | 156 | )); |
157 | 157 | |
158 | 158 | FiberHelper::runFiberSequence( |
159 | - static fn () => $root->runScoped(static function (ContextInterface $ctx) { |
|
160 | - for ($i = 0; $i < 10; $i++) { |
|
159 | + static fn () => $root->runScoped(static function (ContextInterface $ctx){ |
|
160 | + for ($i = 0; $i < 10; $i++){ |
|
161 | 161 | self::assertInstanceOf(ReflectionParameter::class, $ctx->getValue(), 'Context injected'); |
162 | 162 | self::assertSame('ctx', $ctx->getValue()->getName()); |
163 | 163 | \Fiber::suspend(); |
164 | 164 | } |
165 | 165 | }, name: 'foo'), |
166 | - static fn () => $root->runScoped(static function (ContextInterface $context) { |
|
167 | - for ($i = 0; $i < 10; $i++) { |
|
166 | + static fn () => $root->runScoped(static function (ContextInterface $context){ |
|
167 | + for ($i = 0; $i < 10; $i++){ |
|
168 | 168 | self::assertInstanceOf(ReflectionParameter::class, $context->getValue(), 'Context injected'); |
169 | 169 | self::assertSame('context', $context->getValue()->getName()); |
170 | 170 | \Fiber::suspend(); |
@@ -36,11 +36,13 @@ discard block |
||
36 | 36 | bindings: [ |
37 | 37 | LoggerInterface::class => KVLogger::class, |
38 | 38 | ], |
39 | - ), static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc) { |
|
39 | + ), static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc) |
|
40 | + { |
|
40 | 41 | // from the current `foo` scope |
41 | 42 | self::assertInstanceOf(KVLogger::class, $logger); |
42 | 43 | |
43 | - for ($i = 0; $i < 10; $i++) { |
|
44 | + for ($i = 0; $i < 10; $i++) |
|
45 | + { |
|
44 | 46 | // because of proxy |
45 | 47 | self::assertNotInstanceOf(KVLogger::class, $carrier->getLogger()); |
46 | 48 | self::assertSame('kv', $carrier->logger->getName()); |
@@ -53,11 +55,13 @@ discard block |
||
53 | 55 | bindings: [ |
54 | 56 | LoggerInterface::class => FileLogger::class, |
55 | 57 | ], |
56 | - ), static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc) { |
|
58 | + ), static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc) |
|
59 | + { |
|
57 | 60 | // from the current `foo` scope |
58 | 61 | self::assertInstanceOf(FileLogger::class, $logger); |
59 | 62 | |
60 | - for ($i = 0; $i < 10; $i++) { |
|
63 | + for ($i = 0; $i < 10; $i++) |
|
64 | + { |
|
61 | 65 | // because of proxy |
62 | 66 | self::assertNotInstanceOf(FileLogger::class, $carrier->getLogger()); |
63 | 67 | self::assertSame('file', $carrier->logger->getName()); |
@@ -74,8 +78,10 @@ discard block |
||
74 | 78 | $root = new Container(); |
75 | 79 | $root->getBinder('http')->bindSingleton(LoggerInterface::class, KVLogger::class); |
76 | 80 | |
77 | - $root->runScoped(static function (Container $c1) { |
|
78 | - $c1->runScoped(static function (ScopedProxyLoggerCarrier $carrier, ScopedProxyLoggerCarrier $carrier2, LoggerInterface $logger) { |
|
81 | + $root->runScoped(static function (Container $c1) |
|
82 | + { |
|
83 | + $c1->runScoped(static function (ScopedProxyLoggerCarrier $carrier, ScopedProxyLoggerCarrier $carrier2, LoggerInterface $logger) |
|
84 | + { |
|
79 | 85 | // from the current `foo` scope |
80 | 86 | self::assertInstanceOf(KVLogger::class, $logger); |
81 | 87 | |
@@ -94,8 +100,10 @@ discard block |
||
94 | 100 | $root = new Container(); |
95 | 101 | $root->getBinder('foo')->bind(LoggerInterface::class, KVLogger::class); |
96 | 102 | |
97 | - $root->runScoped(static function (Container $c1) { |
|
98 | - $c1->runScoped(static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) { |
|
103 | + $root->runScoped(static function (Container $c1) |
|
104 | + { |
|
105 | + $c1->runScoped(static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) |
|
106 | + { |
|
99 | 107 | // from the current `foo` scope |
100 | 108 | self::assertInstanceOf(KVLogger::class, $logger); |
101 | 109 | |
@@ -113,7 +121,8 @@ discard block |
||
113 | 121 | $root = new Container(); |
114 | 122 | $root->getBinder('foo') |
115 | 123 | ->bind(ContextInterface::class, new \Spiral\Core\Config\Injectable( |
116 | - new class implements InjectorInterface { |
|
124 | + new class implements InjectorInterface |
|
125 | + { |
|
117 | 126 | public function createInjection(\ReflectionClass $class, mixed $context = null): Context |
118 | 127 | { |
119 | 128 | return new Context($context); |
@@ -121,8 +130,10 @@ discard block |
||
121 | 130 | } |
122 | 131 | )); |
123 | 132 | |
124 | - $root->runScoped(static function (Container $c1) { |
|
125 | - $c1->runScoped(static function (Container $c, ContextInterface $param) { |
|
133 | + $root->runScoped(static function (Container $c1) |
|
134 | + { |
|
135 | + $c1->runScoped(static function (Container $c, ContextInterface $param) |
|
136 | + { |
|
126 | 137 | self::assertInstanceOf(ReflectionParameter::class, $param->value); |
127 | 138 | self::assertSame('param', $param->value->getName()); |
128 | 139 | |
@@ -147,7 +158,8 @@ discard block |
||
147 | 158 | $root = new Container(); |
148 | 159 | $root->getBinder('foo') |
149 | 160 | ->bind(ContextInterface::class, new \Spiral\Core\Config\Injectable( |
150 | - new class implements InjectorInterface { |
|
161 | + new class implements InjectorInterface |
|
162 | + { |
|
151 | 163 | public function createInjection(\ReflectionClass $class, mixed $context = null): Context |
152 | 164 | { |
153 | 165 | return new Context($context); |
@@ -156,15 +168,19 @@ discard block |
||
156 | 168 | )); |
157 | 169 | |
158 | 170 | FiberHelper::runFiberSequence( |
159 | - static fn () => $root->runScoped(static function (ContextInterface $ctx) { |
|
160 | - for ($i = 0; $i < 10; $i++) { |
|
171 | + static fn () => $root->runScoped(static function (ContextInterface $ctx) |
|
172 | + { |
|
173 | + for ($i = 0; $i < 10; $i++) |
|
174 | + { |
|
161 | 175 | self::assertInstanceOf(ReflectionParameter::class, $ctx->getValue(), 'Context injected'); |
162 | 176 | self::assertSame('ctx', $ctx->getValue()->getName()); |
163 | 177 | \Fiber::suspend(); |
164 | 178 | } |
165 | 179 | }, name: 'foo'), |
166 | - static fn () => $root->runScoped(static function (ContextInterface $context) { |
|
167 | - for ($i = 0; $i < 10; $i++) { |
|
180 | + static fn () => $root->runScoped(static function (ContextInterface $context) |
|
181 | + { |
|
182 | + for ($i = 0; $i < 10; $i++) |
|
183 | + { |
|
168 | 184 | self::assertInstanceOf(ReflectionParameter::class, $context->getValue(), 'Context injected'); |
169 | 185 | self::assertSame('context', $context->getValue()->getName()); |
170 | 186 | \Fiber::suspend(); |
@@ -10,7 +10,7 @@ |
||
10 | 10 | { |
11 | 11 | public function __construct( |
12 | 12 | #[Proxy] public ContextInterface $context, |
13 | - ) { |
|
13 | + ){ |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | public function getContext(): ContextInterface |
@@ -7,11 +7,11 @@ |
||
7 | 7 | final class Context implements ContextInterface |
8 | 8 | { |
9 | 9 | public function __construct( |
10 | - public \Stringable|string|null $value, |
|
11 | - ) { |
|
10 | + public \Stringable | string | null $value, |
|
11 | + ){ |
|
12 | 12 | } |
13 | 13 | |
14 | - public function getValue(): \Stringable|string|null |
|
14 | + public function getValue(): \Stringable | string | null |
|
15 | 15 | { |
16 | 16 | return $this->value; |
17 | 17 | } |
@@ -6,5 +6,5 @@ |
||
6 | 6 | |
7 | 7 | interface ContextInterface |
8 | 8 | { |
9 | - public function getValue(): \Stringable|string|null; |
|
9 | + public function getValue(): \Stringable | string | null; |
|
10 | 10 | } |
@@ -19,19 +19,19 @@ discard block |
||
19 | 19 | * @param \ReflectionClass<TClass> $type |
20 | 20 | * @return TClass |
21 | 21 | */ |
22 | - public static function create(\ReflectionClass $type, \Stringable|string|null $context): object |
|
22 | + public static function create(\ReflectionClass $type, \Stringable | string | null $context): object |
|
23 | 23 | { |
24 | 24 | $interface = $type->getName(); |
25 | 25 | |
26 | - if (!\array_key_exists($interface, self::$cache)) { |
|
26 | + if (!\array_key_exists($interface, self::$cache)){ |
|
27 | 27 | /** @var class-string<TClass> $className */ |
28 | 28 | $className = "{$type->getNamespaceName()}\\{$type->getShortName()} SCOPED PROXY"; |
29 | 29 | |
30 | - try { |
|
30 | + try{ |
|
31 | 31 | $classString = ProxyClassRenderer::renderClass($type, $className); |
32 | 32 | |
33 | 33 | eval($classString); |
34 | - } catch (\Throwable $e) { |
|
34 | + }catch (\Throwable $e){ |
|
35 | 35 | throw new \Error("Unable to create proxy for `{$interface}`: {$e->getMessage()}", 0, $e); |
36 | 36 | } |
37 | 37 | |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | |
41 | 41 | // Store in cache without context |
42 | 42 | self::$cache[$interface] = $instance; |
43 | - } else { |
|
43 | + }else{ |
|
44 | 44 | /** @var TClass $instance */ |
45 | 45 | $instance = self::$cache[$interface]; |
46 | 46 | } |
47 | 47 | |
48 | - if ($context !== null) { |
|
48 | + if ($context !== null){ |
|
49 | 49 | $instance = clone $instance; |
50 | 50 | (static fn() => $instance->__container_proxy_context = $context)->bindTo(null, $instance::class)(); |
51 | 51 | } |
@@ -23,15 +23,19 @@ discard block |
||
23 | 23 | { |
24 | 24 | $interface = $type->getName(); |
25 | 25 | |
26 | - if (!\array_key_exists($interface, self::$cache)) { |
|
26 | + if (!\array_key_exists($interface, self::$cache)) |
|
27 | + { |
|
27 | 28 | /** @var class-string<TClass> $className */ |
28 | 29 | $className = "{$type->getNamespaceName()}\\{$type->getShortName()} SCOPED PROXY"; |
29 | 30 | |
30 | - try { |
|
31 | + try |
|
32 | + { |
|
31 | 33 | $classString = ProxyClassRenderer::renderClass($type, $className); |
32 | 34 | |
33 | 35 | eval($classString); |
34 | - } catch (\Throwable $e) { |
|
36 | + } |
|
37 | + catch (\Throwable $e) |
|
38 | + { |
|
35 | 39 | throw new \Error("Unable to create proxy for `{$interface}`: {$e->getMessage()}", 0, $e); |
36 | 40 | } |
37 | 41 | |
@@ -40,12 +44,15 @@ discard block |
||
40 | 44 | |
41 | 45 | // Store in cache without context |
42 | 46 | self::$cache[$interface] = $instance; |
43 | - } else { |
|
47 | + } |
|
48 | + else |
|
49 | + { |
|
44 | 50 | /** @var TClass $instance */ |
45 | 51 | $instance = self::$cache[$interface]; |
46 | 52 | } |
47 | 53 | |
48 | - if ($context !== null) { |
|
54 | + if ($context !== null) |
|
55 | + { |
|
49 | 56 | $instance = clone $instance; |
50 | 57 | (static fn() => $instance->__container_proxy_context = $context)->bindTo(null, $instance::class)(); |
51 | 58 | } |