spiral / framework

src/Core/tests/Scope/ProxyTest.php

Spacing +18 added lines, -18 removed lines

@@ -48,7 +48,7 @@ 
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++){
                         // because of proxy
                         self::assertNotInstanceOf(KVLogger::class, $carrier->getLogger());
                         self::assertSame('kv', $carrier->logger->getName());
@@ -68,7 +68,7 @@ 
                     // from the current `foo` scope
                     self::assertInstanceOf(FileLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++){
                         // because of proxy
                         self::assertNotInstanceOf(FileLogger::class, $carrier->getLogger());
                         self::assertSame('file', $carrier->logger->getName());
@@ -85,14 +85,14 @@ 
         $root = new Container();
         $root->getBinder('http')->bindSingleton(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1){
             $c1->runScope(
                 new Scope(name: 'http'),
                 static function (
                     ScopedProxyLoggerCarrier $carrier,
                     ScopedProxyLoggerCarrier $carrier2,
                     LoggerInterface $logger,
-                ) {
+                ){
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
@@ -112,10 +112,10 @@ 
         $root = new Container();
         $root->getBinder('foo')->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1){
             $c1->runScope(
                 new Scope(name: 'foo'),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger){
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
@@ -136,7 +136,7 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface{
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -145,8 +145,8 @@ 
                 ),
             );
 
-        $root->runScope(new Scope(), static function (Container $c1) {
-            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param) {
+        $root->runScope(new Scope(), static function (Container $c1){
+            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param){
                 self::assertInstanceOf(ReflectionParameter::class, $param->value);
                 self::assertSame('param', $param->value->getName());
 
@@ -177,7 +177,7 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface{
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -187,15 +187,15 @@ 
             );
 
         FiberHelper::runFiberSequence(
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx){
+                for ($i = 0; $i < 10; $i++){
                     self::assertInstanceOf(ReflectionParameter::class, $ctx->getValue(), 'Context injected');
                     self::assertSame('ctx', $ctx->getValue()->getName());
                     \Fiber::suspend();
                 }
             }),
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context){
+                for ($i = 0; $i < 10; $i++){
                     self::assertInstanceOf(ReflectionParameter::class, $context->getValue(), 'Context injected');
                     self::assertSame('context', $context->getValue()->getName());
                     \Fiber::suspend();
@@ -256,10 +256,10 @@ 
     {
         $root = new Container();
         $context = (object)['destroyed' => false];
-        $class = new class($context) implements DestroyableInterface {
+        $class = new class($context) implements DestroyableInterface{
             public function __construct(
                 private readonly \stdClass $context,
-            ) {
+            ){
             }
 
             public function __destruct()
@@ -287,7 +287,7 @@ 
             new Scope('http'),
             static function () use ($root, $proxy) {
                 self::assertSame('Foo', $proxy->getName());
-                $proxy->setName(new class implements \Stringable {
+                $proxy->setName(new class implements \Stringable{
                     public function __toString(): string
                     {
                         return 'Bar';
@@ -326,7 +326,7 @@ 
 
         $root->runScope(
             new Scope(),
-            static function (#[Proxy] ContainerInterface $proxy, ContainerInterface $scoped) {
+            static function (#[Proxy] ContainerInterface $proxy, ContainerInterface $scoped){
                 self::assertNotSame($scoped, $proxy);
                 ContainerScope::runScope($proxy, static function (ContainerInterface $passed) use ($proxy, $scoped) {
                     self::assertNotSame($passed, $proxy);

Braces +42 added lines, -21 removed lines

@@ -44,11 +44,13 @@ 
                         LoggerInterface::class => KVLogger::class,
                     ],
                 ),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc)
+                {
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++)
+                    {
                         // because of proxy
                         self::assertNotInstanceOf(KVLogger::class, $carrier->getLogger());
                         self::assertSame('kv', $carrier->logger->getName());
@@ -64,11 +66,13 @@ 
                         LoggerInterface::class => FileLogger::class,
                     ],
                 ),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc)
+                {
                     // from the current `foo` scope
                     self::assertInstanceOf(FileLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++)
+                    {
                         // because of proxy
                         self::assertNotInstanceOf(FileLogger::class, $carrier->getLogger());
                         self::assertSame('file', $carrier->logger->getName());
@@ -85,7 +89,8 @@ 
         $root = new Container();
         $root->getBinder('http')->bindSingleton(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
             $c1->runScope(
                 new Scope(name: 'http'),
                 static function (
@@ -112,10 +117,12 @@ 
         $root = new Container();
         $root->getBinder('foo')->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
             $c1->runScope(
                 new Scope(name: 'foo'),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger)
+                {
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
@@ -136,7 +143,8 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface
+                    {
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -145,8 +153,10 @@ 
                 ),
             );
 
-        $root->runScope(new Scope(), static function (Container $c1) {
-            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
+            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param)
+            {
                 self::assertInstanceOf(ReflectionParameter::class, $param->value);
                 self::assertSame('param', $param->value->getName());
 
@@ -177,7 +187,8 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface
+                    {
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -187,15 +198,19 @@ 
             );
 
         FiberHelper::runFiberSequence(
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx)
+            {
+                for ($i = 0; $i < 10; $i++)
+                {
                     self::assertInstanceOf(ReflectionParameter::class, $ctx->getValue(), 'Context injected');
                     self::assertSame('ctx', $ctx->getValue()->getName());
                     \Fiber::suspend();
                 }
             }),
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context)
+            {
+                for ($i = 0; $i < 10; $i++)
+                {
                     self::assertInstanceOf(ReflectionParameter::class, $context->getValue(), 'Context injected');
                     self::assertSame('context', $context->getValue()->getName());
                     \Fiber::suspend();
@@ -211,8 +226,10 @@ 
 
         $root->runScope(
             new Scope(),
-            static function (#[Proxy] ContainerInterface $cp) use ($root) {
-                $root->runScope(new Scope(name: 'http'), static function (ContainerInterface $c) use ($cp) {
+            static function (#[Proxy] ContainerInterface $cp) use ($root)
+            {
+                $root->runScope(new Scope(name: 'http'), static function (ContainerInterface $c) use ($cp)
+                {
                     self::assertNotSame($c, $cp);
                     self::assertSame($c, $cp->get(ContainerInterface::class));
                     self::assertInstanceOf(KVLogger::class, $cp->get(LoggerInterface::class));
@@ -256,7 +273,8 @@ 
     {
         $root = new Container();
         $context = (object)['destroyed' => false];
-        $class = new class($context) implements DestroyableInterface {
+        $class = new class($context) implements DestroyableInterface
+        {
             public function __construct(
                 private readonly \stdClass $context,
             ) {
@@ -285,7 +303,8 @@ 
 
         $root->runScope(
             new Scope('http'),
-            static function () use ($root, $proxy) {
+            static function () use ($root, $proxy)
+            {
                 self::assertSame('Foo', $proxy->getName());
                 $proxy->setName(new class implements \Stringable {
                     public function __toString(): string
@@ -326,9 +345,11 @@ 
 
         $root->runScope(
             new Scope(),
-            static function (#[Proxy] ContainerInterface $proxy, ContainerInterface $scoped) {
+            static function (#[Proxy] ContainerInterface $proxy, ContainerInterface $scoped)
+            {
                 self::assertNotSame($scoped, $proxy);
-                ContainerScope::runScope($proxy, static function (ContainerInterface $passed) use ($proxy, $scoped) {
+                ContainerScope::runScope($proxy, static function (ContainerInterface $passed) use ($proxy, $scoped)
+                {
                     self::assertNotSame($passed, $proxy);
                     self::assertSame($scoped, ContainerScope::getContainer());
                 });

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

Spacing +8 added lines, -8 removed lines

@@ -19,27 +19,27 @@ 
 {
     public static function resolve(
         string $alias,
-        \Stringable|string|null $context = null,
+        \Stringable | string | null $context = null,
         ?ContainerInterface $c = null,
     ): object {
         $c ??= ContainerScope::getContainer() ?? throw new ContainerException('Proxy is out of scope.');
 
-        try {
+        try{
             /** @psalm-suppress TooManyArguments */
             $result = $c->get($alias, $context) ?? throw new ContainerException(
                 'Resolved `null` from the container.',
             );
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $scope = self::getScope($c);
             throw new ContainerException(
                 $scope === null
                     ? "Unable to resolve `{$alias}` in a Proxy."
                     : "Unable to resolve `{$alias}` in a Proxy in `{$scope}` scope.",
-                previous: $e,
+                previous : $e,
             );
         }
 
-        if (Proxy::isProxy($result)) {
+        if (Proxy::isProxy($result)){
             $scope = self::getScope($c);
             throw new RecursiveProxyException(
                 $scope === null
@@ -56,8 +56,8 @@ 
      */
     private static function getScope(ContainerInterface $c): ?string
     {
-        if (!$c instanceof Container) {
-            if (!Proxy::isProxy($c)) {
+        if (!$c instanceof Container){
+            if (!Proxy::isProxy($c)){
                 return null;
             }
 
@@ -65,7 +65,7 @@ 
         }
 
         return \implode('.', \array_reverse(\array_map(
-            static fn (?string $name): string => $name ?? 'null',
+            static fn (?string $name) : string => $name ?? 'null',
             Introspector::scopeNames($c),
         )));
     }

Braces +11 added lines, -5 removed lines

@@ -24,12 +24,15 @@ 
     ): object {
         $c ??= ContainerScope::getContainer() ?? throw new ContainerException('Proxy is out of scope.');
 
-        try {
+        try
+        {
             /** @psalm-suppress TooManyArguments */
             $result = $c->get($alias, $context) ?? throw new ContainerException(
                 'Resolved `null` from the container.',
             );
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $scope = self::getScope($c);
             throw new ContainerException(
                 $scope === null
@@ -39,7 +42,8 @@ 
             );
         }
 
-        if (Proxy::isProxy($result)) {
+        if (Proxy::isProxy($result))
+        {
             $scope = self::getScope($c);
             throw new RecursiveProxyException(
                 $scope === null
@@ -56,8 +60,10 @@ 
      */
     private static function getScope(ContainerInterface $c): ?string
     {
-        if (!$c instanceof Container) {
-            if (!Proxy::isProxy($c)) {
+        if (!$c instanceof Container)
+        {
+            if (!Proxy::isProxy($c))
+            {
                 return null;
             }
 

src/Core/src/ContainerScope.php

Spacing +8 added lines, -8 removed lines

@@ -34,26 +34,26 @@ 
      */
     public static function runScope(ContainerInterface $container, callable $scope): mixed
     {
-        if (Proxy::isProxy($container)) {
+        if (Proxy::isProxy($container)){
             // Ignore Proxy to avoid recursion
             $container = $previous = self::$container ?? throw new ContainerException('Proxy is out of scope.');
-        } else {
+        }else{
             [$previous, self::$container] = [self::$container, $container];
         }
 
-        try {
-            if (Fiber::getCurrent() === null) {
+        try{
+            if (Fiber::getCurrent() === null){
                 return $scope(self::$container);
             }
 
             // Wrap scope into fiber
             $fiber = new Fiber(static fn () => $scope(self::$container));
             $value = $fiber->start();
-            while (!$fiber->isTerminated()) {
+            while (!$fiber->isTerminated()){
                 self::$container = $previous;
-                try {
+                try{
                     $resume = Fiber::suspend($value);
-                } catch (Throwable $e) {
+                }catch (Throwable $e){
                     self::$container = $container;
                     $value = $fiber->throw($e);
                     continue;
@@ -63,7 +63,7 @@ 
                 $value = $fiber->resume($resume);
             }
             return $fiber->getReturn();
-        } finally {
+        }finally{
             self::$container = $previous;
         }
     }

Braces +19 added lines, -8 removed lines

@@ -34,26 +34,35 @@ 
      */
     public static function runScope(ContainerInterface $container, callable $scope): mixed
     {
-        if (Proxy::isProxy($container)) {
+        if (Proxy::isProxy($container))
+        {
             // Ignore Proxy to avoid recursion
             $container = $previous = self::$container ?? throw new ContainerException('Proxy is out of scope.');
-        } else {
+        }
+        else
+        {
             [$previous, self::$container] = [self::$container, $container];
         }
 
-        try {
-            if (Fiber::getCurrent() === null) {
+        try
+        {
+            if (Fiber::getCurrent() === null)
+            {
                 return $scope(self::$container);
             }
 
             // Wrap scope into fiber
             $fiber = new Fiber(static fn () => $scope(self::$container));
             $value = $fiber->start();
-            while (!$fiber->isTerminated()) {
+            while (!$fiber->isTerminated())
+            {
                 self::$container = $previous;
-                try {
+                try
+                {
                     $resume = Fiber::suspend($value);
-                } catch (Throwable $e) {
+                }
+                catch (Throwable $e)
+                {
                     self::$container = $container;
                     $value = $fiber->throw($e);
                     continue;
@@ -63,7 +72,9 @@ 
                 $value = $fiber->resume($resume);
             }
             return $fiber->getReturn();
-        } finally {
+        }
+        finally
+        {
             self::$container = $previous;
         }
     }