spiral / framework

src/Core/tests/Internal/Proxy/ProxyClassRendererTest.php

Braces +10 added lines, -4 removed lines

@@ -72,22 +72,28 @@
 
     public static function provideRenderMethod(): iterable
     {
-        $class = new class {
+        $class = new class
+        {
             public const INT_CONST = 42;
 
             #[ExpectedAttribute('public function test1(...$variadic)')]
-            public function test1(...$variadic) {}
+            public function test1(...$variadic)
+            {
+}
             #[ExpectedAttribute('public function test2(string|int $string = self::INT_CONST): string|int')]
             public function test2(string|int $string = self::INT_CONST): string|int {}
             #[ExpectedAttribute('public function test3(object $obj = new \stdClass(new \stdClass(), new \stdClass()))')]
-            public function test3(object $obj = new stdClass(new stdClass(), new stdClass())) {}
+            public function test3(object $obj = new stdClass(new stdClass(), new stdClass()))
+            {
+}
             #[ExpectedAttribute('public function test4(): \\' . ProxyClassRendererTest::class)]
             public function test4(): ProxyClassRendererTest {}
             #[ExpectedAttribute('public function &test5(): string')]
             public function &test5(): string {}
         };
 
-        foreach ((new \ReflectionClass($class))->getMethods() as $method) {
+        foreach ((new \ReflectionClass($class))->getMethods() as $method)
+        {
             $expected = $method->getAttributes(ExpectedAttribute::class)[0]->newInstance();
 
             yield [$method, $expected->value];

src/Core/tests/Internal/Proxy/Stub/MockInterfaceImpl.php

Braces +2 added lines, -1 removed lines

@@ -48,7 +48,8 @@
 
     public function concatMultiple(string $prefix, string &...$byLink): array
     {
-        foreach ($byLink as $k => $link) {
+        foreach ($byLink as $k => $link)
+        {
             $byLink[$k] = $prefix . $link;
             unset($link);
         }

src/Core/tests/Scope/FibersTest.php

Braces +21 added lines, -10 removed lines

@@ -30,7 +30,8 @@ 
 
         FiberHelper::runInFiber(
             self::functionScopedTestDataIterator(),
-            static function (mixed $suspendValue) {
+            static function (mixed $suspendValue)
+            {
                 self::assertNull(ContainerScope::getContainer());
                 self::assertTrue(\in_array($suspendValue, self::TEST_DATA, true));
             },
@@ -63,7 +64,8 @@ 
         );
 
         self::assertCount(5, $result);
-        foreach ($result as $suspendValue) {
+        foreach ($result as $suspendValue)
+        {
             self::assertSame(self::TEST_DATA, $suspendValue);
         }
     }
@@ -81,7 +83,8 @@ 
         );
 
         self::assertCount(2, $result);
-        foreach ($result as $suspendValue) {
+        foreach ($result as $suspendValue)
+        {
             self::assertSame(self::TEST_DATA, $suspendValue);
         }
     }
@@ -92,7 +95,8 @@ 
         $this->expectExceptionMessage('test');
 
         FiberHelper::runInFiber(
-            static function () {
+            static function ()
+            {
                 return (new Container())->runScoped(
                     function (): string {
                         $result = '';
@@ -114,15 +118,19 @@ 
     public function testCatchThrownException(): void
     {
         $result = FiberHelper::runInFiber(
-            static function () {
+            static function ()
+            {
                 return (new Container())->runScoped(
                     function (): string {
                         $result = '';
                         $result .= Fiber::suspend('foo');
                         $result .= Fiber::suspend('bar');
-                        try {
+                        try
+                        {
                             $result .= Fiber::suspend('error');
-                        } catch (\Throwable $e) {
+                        }
+                        catch (\Throwable $e)
+                        {
                             $result .= $e->getMessage();
                         }
                         $result .= Fiber::suspend('baz');
@@ -160,20 +168,23 @@ 
             $c1 = $container ?? new Container();
             $c1->bindSingleton('resource', new stdClass());
 
-            $result = $c1->runScoped(static function (Container $c2) use ($load) {
+            $result = $c1->runScoped(static function (Container $c2) use ($load)
+            {
                 // check local binding
                 self::assertTrue($c2->has('foo'));
                 self::assertInstanceOf(DateTime::class, $c2->get('foo'));
 
                 return $c2->runScoped(
-                    static function (ContainerInterface $c3) use ($load) {
+                    static function (ContainerInterface $c3) use ($load)
+                    {
                         // check local binding
                         self::assertTrue($c3->has('bar'));
 
                         $resource = $c3->get('resource');
                         self::assertInstanceOf(DateTimeImmutable::class, $c3->get('bar'));
                         self::assertInstanceOf(stdClass::class, $resource);
-                        foreach (self::TEST_DATA as $key => $value) {
+                        foreach (self::TEST_DATA as $key => $value)
+                        {
                             $resource->$key = $value;
                             $load === null or $load();
                             Fiber::suspend($value);

src/Core/tests/Scope/FiberHelper.php

Braces +26 added lines, -12 removed lines

@@ -22,11 +22,16 @@ 
     {
         $fiber = new Fiber($callable);
         $value = $fiber->start();
-        while (!$fiber->isTerminated()) {
-            if ($check !== null) {
-                try {
+        while (!$fiber->isTerminated())
+        {
+            if ($check !== null)
+            {
+                try
+                {
                     $value = $check($value);
-                } catch (\Throwable $e) {
+                }
+                catch (\Throwable $e)
+                {
                     $value = $fiber->throw($e);
                     continue;
                 }
@@ -50,14 +55,17 @@ 
         /** Values that were suspended by the fiber. */
         $suspends = [];
         $results = [];
-        foreach ($callables as $key => $callable) {
-            $fiberGenerators[$key] = (static function () use ($callable) {
+        foreach ($callables as $key => $callable)
+        {
+            $fiberGenerators[$key] = (static function () use ($callable)
+            {
                 $fiber = new Fiber($callable);
                 // Get ready
                 yield null;
 
                 $value = yield $fiber->start();
-                while (!$fiber->isTerminated()) {
+                while (!$fiber->isTerminated())
+                {
                     $value = yield $fiber->resume($value);
                 }
                 return $fiber->getReturn();
@@ -67,15 +75,21 @@ 
         }
 
 
-        while ($fiberGenerators !== []) {
-            foreach ($fiberGenerators as $key => $generator) {
-                try {
+        while ($fiberGenerators !== [])
+        {
+            foreach ($fiberGenerators as $key => $generator)
+            {
+                try
+                {
                     $suspends[$key] = $generator->send($suspends[$key]);
-                    if (!$generator->valid()) {
+                    if (!$generator->valid())
+                    {
                         $results[$key] = $generator->getReturn();
                         unset($fiberGenerators[$key]);
                     }
-                } catch (\Throwable $e) {
+                }
+                catch (\Throwable $e)
+                {
                     unset($fiberGenerators[$key]);
                     $results[$key] = $e;
                 }

src/Core/tests/Scope/UseCaseTest.php

Braces +18 added lines, -9 removed lines

@@ -28,7 +28,8 @@ 
         $root = new Container();
         $root->bind('foo', SampleClass::class);
 
-        $root->runScoped(function (ContainerInterface $c1) {
+        $root->runScoped(function (ContainerInterface $c1)
+        {
             $c1->get('foo');
         }, bindings: ['foo' => SampleClass::class]);
 
@@ -61,7 +62,8 @@ 
     {
         $root = new Container();
 
-        $root->runScoped(function (ContainerInterface $c1) use ($theSame, $alias) {
+        $root->runScoped(function (ContainerInterface $c1) use ($theSame, $alias)
+        {
             $obj1 = $c1->get($alias);
             $obj2 = $c1->get($alias);
 
@@ -86,14 +88,16 @@ 
     {
         $root = new Container();
 
-        $root->runScoped(function (ContainerInterface $c1) use ($root) {
+        $root->runScoped(function (ContainerInterface $c1) use ($root)
+        {
             $obj1 = $c1->get('foo');
             $this->weakMap->offsetSet($obj1, true);
 
             self::assertNotSame($root, $c1);
             self::assertInstanceOf(stdClass::class, $obj1);
 
-            $c1->runScoped(function (ContainerInterface $c2) use ($root, $c1, $obj1) {
+            $c1->runScoped(function (ContainerInterface $c2) use ($root, $c1, $obj1)
+            {
                 $obj2 = $c2->get('foo');
                 $this->weakMap->offsetSet($obj2, true);
 
@@ -122,14 +126,16 @@ 
         $root->bindSingleton('bar', [Factory::class, 'makeStdClass']);
         $root->bind(stdClass::class, new stdClass());
 
-        $root->runScoped(function (ContainerInterface $c1) use ($root) {
+        $root->runScoped(function (ContainerInterface $c1) use ($root)
+        {
             $obj1 = $c1->get('foo');
             $this->weakMap->offsetSet($obj1, true);
 
             self::assertInstanceOf(stdClass::class, $obj1);
             // Singleton must be the same
             self::assertSame($c1->get('bar'), $root->get('bar'));
-            $c1->runScoped(function (ContainerInterface $c2) use ($root, $obj1) {
+            $c1->runScoped(function (ContainerInterface $c2) use ($root, $obj1)
+            {
                 $obj2 = $c2->get('foo');
 
                 self::assertInstanceOf(stdClass::class, $obj2);
@@ -262,7 +268,8 @@ 
     {
         $root = new Container();
 
-        $root->invoke(static function () use ($root) {
+        $root->invoke(static function () use ($root)
+        {
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
         });
@@ -271,7 +278,8 @@ 
     public function testRegisterContainerOnGet(): void
     {
         $root = new Container();
-        $root->bind('foo', function () use ($root) {
+        $root->bind('foo', function () use ($root)
+        {
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
         });
@@ -282,7 +290,8 @@ 
     public function testRegisterContainerOnMake(): void
     {
         $root = new Container();
-        $root->bind('foo', function () use ($root) {
+        $root->bind('foo', function () use ($root)
+        {
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
         });

src/Core/src/Container.php

Braces +46 added lines, -21 removed lines

@@ -170,23 +170,29 @@ 
      */
     public function runScope(Scope|array $bindings, callable $scope): mixed
     {
-        if (!\is_array($bindings)) {
+        if (!\is_array($bindings))
+        {
             return $this->runIsolatedScope($bindings, $scope);
         }
 
         $binds = &$this->state->bindings;
         $singletons = &$this->state->singletons;
         $cleanup = $previous = $prevSin = [];
-        foreach ($bindings as $alias => $resolver) {
+        foreach ($bindings as $alias => $resolver)
+        {
             // Store previous bindings
-            if (isset($binds[$alias])) {
+            if (isset($binds[$alias]))
+            {
                 $previous[$alias] = $binds[$alias];
-            } else {
+            }
+            else
+            {
                 // Store bindings to be removed
                 $cleanup[] = $alias;
             }
             // Store previous singletons
-            if (isset($singletons[$alias])) {
+            if (isset($singletons[$alias]))
+            {
                 $prevSin[$alias] = $singletons[$alias];
                 unset($singletons[$alias]);
             }
@@ -194,21 +200,27 @@ 
             $this->binder->bind($alias, $resolver);
         }
 
-        try {
+        try
+        {
             return ContainerScope::getContainer() !== $this
                 ? ContainerScope::runScope($this, $scope)
                 : $scope($this);
-        } finally {
+        }
+        finally
+        {
             // Remove new bindings
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias)
+            {
                 unset($binds[$alias], $singletons[$alias]);
             }
             // Restore previous bindings
-            foreach ($previous as $alias => $resolver) {
+            foreach ($previous as $alias => $resolver)
+            {
                 $binds[$alias] = $resolver;
             }
             // Restore singletons
-            foreach ($prevSin as $alias => $instance) {
+            foreach ($prevSin as $alias => $instance)
+            {
                 $singletons[$alias] = $instance;
             }
         }
@@ -265,7 +277,8 @@ 
      */
     public function bindSingleton(string $alias, string|array|callable|object $resolver, bool $force = true): void
     {
-        if ($force) {
+        if ($force)
+        {
             $this->binder->removeBinding($alias);
         }
 
@@ -336,8 +349,10 @@ 
         ]);
 
         // Create container services
-        foreach ($container->config as $property => $class) {
-            if (\property_exists($container, $property)) {
+        foreach ($container->config as $property => $class)
+        {
+            if (\property_exists($container, $property))
+            {
                 $container->$property = $constructor->get($property, $class);
             }
         }
@@ -351,7 +366,8 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope))
+        {
             $this->destruct();
             return;
         }
@@ -360,10 +376,14 @@ 
 
         // Run finalizers
         $errors = [];
-        foreach ($this->state->finalizers as $finalizer) {
-            try {
+        foreach ($this->state->finalizers as $finalizer)
+        {
+            try
+            {
                 $this->invoker->invoke($finalizer);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 $errors[] = $e;
             }
         }
@@ -372,7 +392,8 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== [])
+        {
             throw new FinalizersException($scopeName, $errors);
         }
     }
@@ -394,18 +415,22 @@ 
         $container->scope->setParent($this, $this->scope);
 
         // Add specific bindings
-        foreach ($config->bindings as $alias => $resolver) {
+        foreach ($config->bindings as $alias => $resolver)
+        {
             $container->binder->bind($alias, $resolver);
         }
 
         return ContainerScope::runScope(
             $container,
             static function (self $container) use ($config, $closure): mixed {
-                try {
+                try
+                {
                     return $config->autowire
                         ? $container->invoke($closure)
                         : $closure($container);
-                } finally {
+                }
+                finally
+                {
                     $container->closeScope();
                 }
             }

src/Core/tests/Scope/SideEffectTest.php

Braces +6 added lines, -3 removed lines

@@ -23,10 +23,12 @@ 
         $root = new Container();
         $root->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
             $c1->bind(LoggerInterface::class, FileLogger::class);
 
-            $c1->runScope(new Scope(), static function (LoggerCarrier $carrier, LoggerInterface $logger) {
+            $c1->runScope(new Scope(), static function (LoggerCarrier $carrier, LoggerInterface $logger)
+            {
                 // from the $root container
                 self::assertInstanceOf(KVLogger::class, $carrier->logger);
                 // from the $c1 container
@@ -40,7 +42,8 @@ 
         $root = new Container();
         $root->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
             $c1->bind(LoggerInterface::class, FileLogger::class);
 
             self::assertInstanceOf(

src/Core/src/Internal/Proxy.php

Braces +14 added lines, -6 removed lines

@@ -37,9 +37,11 @@ 
             $attribute->proxyOverloads ? '[magic-calls]' : '',
         );
 
-        if (!\array_key_exists($cacheKey, self::$cache)) {
+        if (!\array_key_exists($cacheKey, self::$cache))
+        {
             $n = 0;
-            do {
+            do
+            {
                 /** @var class-string<TClass> $className */
                 $className = \sprintf(
                     '%s\%s SCOPED PROXY%s',
@@ -49,7 +51,8 @@ 
                 );
             } while (\class_exists($className));
 
-            try {
+            try
+            {
                 $classString = ProxyClassRenderer::renderClass(
                     $type,
                     $className,
@@ -58,7 +61,9 @@ 
                 );
 
                 eval($classString);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 throw new \Error("Unable to create proxy for `{$interface}`: {$e->getMessage()}", 0, $e);
             }
 
@@ -67,12 +72,15 @@ 
 
             // Store in cache without context
             self::$cache[$cacheKey] = $instance;
-        } else {
+        }
+        else
+        {
             /** @var TClass $instance */
             $instance = self::$cache[$cacheKey];
         }
 
-        if ($context !== null || $attachContainer) {
+        if ($context !== null || $attachContainer)
+        {
             $instance = clone $instance;
             (static function () use ($instance, $context, $attachContainer): void {
                 // Set the Current Context

src/Core/src/Internal/Proxy/Resolver.php

Braces +5 added lines, -2 removed lines

@@ -20,11 +20,14 @@
     ): object {
         $c ??= ContainerScope::getContainer() ?? throw new ContainerException('Proxy is out of scope.');
 
-        try {
+        try
+        {
             $result = $c->get($alias, $context) ?? throw new ContainerException(
                 'Resolved `null` from the container.',
             );
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new ContainerException(
                 \sprintf('Unable to resolve `%s` in a Proxy.', $alias),
                 previous: $e,