spiral / framework

src/Core/tests/Scope/Stub/Context.php

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@
 final class Context implements ContextInterface
 {
     public function __construct(
-        public \Stringable|string|null $value,
-    ) {
+        public \Stringable | string | null $value,
+    ){
     }
 
-    public function getValue(): \Stringable|string|null
+    public function getValue(): \Stringable | string | null
     {
         return $this->value;
     }

src/Core/tests/Scope/Stub/ContextInterface.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 
 interface ContextInterface
 {
-    public function getValue(): \Stringable|string|null;
+    public function getValue(): \Stringable | string | null;
 }

src/Core/tests/Scope/ProxyTest.php

Spacing +14 added lines, -14 removed lines

@@ -42,7 +42,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());
@@ -62,7 +62,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());
@@ -79,14 +79,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);
 
@@ -106,10 +106,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);
 
@@ -130,7 +130,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);
@@ -139,8 +139,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());
 
@@ -171,7 +171,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);
@@ -181,15 +181,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();

Braces +34 added lines, -17 removed lines

@@ -38,11 +38,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());
@@ -58,11 +60,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());
@@ -79,7 +83,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 (
@@ -106,10 +111,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);
 
@@ -130,7 +137,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);
@@ -139,8 +147,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());
 
@@ -171,7 +181,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);
@@ -181,15 +192,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();
@@ -205,8 +220,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));

src/Core/tests/Scope/SideEffectTest.php

Spacing +3 added lines, -3 removed lines

@@ -23,10 +23,10 @@ 
         $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 +40,7 @@ 
         $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(

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/Resolver.php

Spacing +40 added lines, -40 removed lines

@@ -53,7 +53,7 @@ 
     ): array {
         $state = new ResolvingState($reflection, $parameters);
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter){
             $this->resolveParameter($parameter, $state, $validate)
             or
             throw new ArgumentResolvingException($reflection, $parameter->getName());
@@ -67,47 +67,47 @@ 
         $positional = true;
         $variadic = false;
         $parameters = $reflection->getParameters();
-        if (\count($parameters) === 0) {
+        if (\count($parameters) === 0){
             return;
         }
 
         $parameter = null;
-        while (\count($parameters) > 0 || \count($arguments) > 0) {
+        while (\count($parameters) > 0 || \count($arguments) > 0){
             // get related argument value
             $key = \key($arguments);
 
             // For a variadic parameter it's no sense - named or positional argument will be sent
             // But you can't send positional argument after named in any case
-            if (\is_int($key) && !$positional) {
+            if (\is_int($key) && !$positional){
                 throw new PositionalArgumentException($reflection, $key);
             }
 
             $positional = $positional && \is_int($key);
 
-            if (!$variadic) {
+            if (!$variadic){
                 $parameter = \array_shift($parameters);
                 $variadic = $parameter?->isVariadic() ?? false;
             }
 
-            if ($parameter === null) {
+            if ($parameter === null){
                 throw new UnknownParameterException($reflection, $key);
             }
             $name = $parameter->getName();
 
-            if (($positional || $variadic) && $key !== null) {
+            if (($positional || $variadic) && $key !== null){
                 /** @psalm-suppress ReferenceReusedFromConfusingScope */
                 $value = \array_shift($arguments);
-            } elseif ($key === null || !\array_key_exists($name, $arguments)) {
-                if ($parameter->isOptional()) {
+            } elseif ($key === null || !\array_key_exists($name, $arguments)){
+                if ($parameter->isOptional()){
                     continue;
                 }
                 throw new MissingRequiredArgumentException($reflection, $name);
-            } else {
+            }else{
                 $value = &$arguments[$name];
                 unset($arguments[$name]);
             }
 
-            if (!$this->validateValueToParameter($parameter, $value)) {
+            if (!$this->validateValueToParameter($parameter, $value)){
                 throw new InvalidArgumentException($reflection, $name);
             }
         }
@@ -115,7 +115,7 @@ 
 
     private function validateValueToParameter(ReflectionParameter $parameter, mixed $value): bool
     {
-        if (!$parameter->hasType() || ($parameter->allowsNull() && $value === null)) {
+        if (!$parameter->hasType() || ($parameter->allowsNull() && $value === null)){
             return true;
         }
         $type = $parameter->getType();
@@ -126,17 +126,17 @@ 
             $type instanceof ReflectionIntersectionType => [false, $type->getTypes()],
         };
 
-        foreach ($types as $t) {
+        foreach ($types as $t){
             \assert($t instanceof ReflectionNamedType);
-            if (!$this->validateValueNamedType($t, $value)) {
+            if (!$this->validateValueNamedType($t, $value)){
                 // If it is TypeIntersection
-                if ($or) {
+                if ($or){
                     continue;
                 }
                 return false;
             }
             // If it is not type intersection then we can skip that value after first successful check
-            if ($or) {
+            if ($or){
                 return true;
             }
         }
@@ -151,7 +151,7 @@ 
     {
         $name = $type->getName();
 
-        if ($type->isBuiltin()) {
+        if ($type->isBuiltin()){
             return match ($name) {
                 'mixed' => true,
                 'string' => \is_string($value),
@@ -184,13 +184,13 @@ 
 
         // Try to resolve parameter by name
         $res = $state->resolveParameterByNameOrPosition($param, $isVariadic);
-        if ($res !== [] || $isVariadic) {
+        if ($res !== [] || $isVariadic){
             // validate
-            if ($isVariadic) {
-                foreach ($res as $k => &$v) {
-                    $this->processArgument($state, $v, validateWith: $validate ? $param : null, key: $k);
+            if ($isVariadic){
+                foreach ($res as $k => &$v){
+                    $this->processArgument($state, $v, validateWith: $validate ? $param : null, key : $k);
                 }
-            } else {
+            }else{
                 $this->processArgument($state, $res[0], validateWith: $validate ? $param : null);
             }
 
@@ -198,41 +198,41 @@ 
         }
 
         $error = null;
-        while ($hasType) {
+        while ($hasType){
             /** @var ReflectionIntersectionType|ReflectionUnionType|ReflectionNamedType $refType */
             $refType = $param->getType();
 
-            if ($refType::class === ReflectionNamedType::class) {
-                if ($refType->isBuiltin()) {
+            if ($refType::class === ReflectionNamedType::class){
+                if ($refType->isBuiltin()){
                     break;
                 }
 
                 if (\interface_exists($refType->getName()) && !empty(
                     $attrs = $param->getAttributes(ProxyAttribute::class)
-                )) {
+                )){
                     $proxy = Proxy::create(
                         new \ReflectionClass($refType->getName()), $param, $attrs[0]->newInstance());
                     $this->processArgument($state, $proxy);
                     return true;
                 }
 
-                try {
-                    if ($this->resolveObject($state, $refType, $param, $validate)) {
+                try{
+                    if ($this->resolveObject($state, $refType, $param, $validate)){
                         return true;
                     }
-                } catch (Throwable $e) {
+                }catch (Throwable $e){
                     $error = $e;
                 }
                 break;
             }
 
-            if ($refType::class === ReflectionUnionType::class) {
-                foreach ($refType->getTypes() as $namedType) {
-                    try {
-                        if (!$namedType->isBuiltin() && $this->resolveObject($state, $namedType, $param, $validate)) {
+            if ($refType::class === ReflectionUnionType::class){
+                foreach ($refType->getTypes() as $namedType){
+                    try{
+                        if (!$namedType->isBuiltin() && $this->resolveObject($state, $namedType, $param, $validate)){
                             return true;
                         }
-                    } catch (Throwable $e) {
+                    }catch (Throwable $e){
                         $error = $e;
                     }
                 }
@@ -242,19 +242,19 @@ 
             throw new UnsupportedTypeException($param->getDeclaringFunction(), $param->getName());
         }
 
-        if ($param->isDefaultValueAvailable()) {
+        if ($param->isDefaultValueAvailable()){
             $argument = $param->getDefaultValue();
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($hasType && $param->allowsNull()) {
+        if ($hasType && $param->allowsNull()){
             $argument = null;
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($error === null) {
+        if ($error === null){
             return false;
         }
 
@@ -292,15 +292,15 @@ 
         ResolvingState $state,
         mixed &$value,
         ReflectionParameter $validateWith = null,
-        int|string $key = null
+        int | string $key = null
     ): void {
         // Resolve Autowire objects
-        if ($value instanceof Autowire) {
+        if ($value instanceof Autowire){
             $value = $value->resolve($this->factory);
         }
 
         // Validation
-        if ($validateWith !== null && !$this->validateValueToParameter($validateWith, $value)) {
+        if ($validateWith !== null && !$this->validateValueToParameter($validateWith, $value)){
             throw new InvalidArgumentException(
                 $validateWith->getDeclaringFunction(),
                 $validateWith->getName()

Braces +81 added lines, -38 removed lines

@@ -53,7 +53,8 @@ 
     ): array {
         $state = new ResolvingState($reflection, $parameters);
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter)
+        {
             $this->resolveParameter($parameter, $state, $validate)
             or
             throw new ArgumentResolvingException($reflection, $parameter->getName());
@@ -67,47 +68,59 @@ 
         $positional = true;
         $variadic = false;
         $parameters = $reflection->getParameters();
-        if (\count($parameters) === 0) {
+        if (\count($parameters) === 0)
+        {
             return;
         }
 
         $parameter = null;
-        while (\count($parameters) > 0 || \count($arguments) > 0) {
+        while (\count($parameters) > 0 || \count($arguments) > 0)
+        {
             // get related argument value
             $key = \key($arguments);
 
             // For a variadic parameter it's no sense - named or positional argument will be sent
             // But you can't send positional argument after named in any case
-            if (\is_int($key) && !$positional) {
+            if (\is_int($key) && !$positional)
+            {
                 throw new PositionalArgumentException($reflection, $key);
             }
 
             $positional = $positional && \is_int($key);
 
-            if (!$variadic) {
+            if (!$variadic)
+            {
                 $parameter = \array_shift($parameters);
                 $variadic = $parameter?->isVariadic() ?? false;
             }
 
-            if ($parameter === null) {
+            if ($parameter === null)
+            {
                 throw new UnknownParameterException($reflection, $key);
             }
             $name = $parameter->getName();
 
-            if (($positional || $variadic) && $key !== null) {
+            if (($positional || $variadic) && $key !== null)
+            {
                 /** @psalm-suppress ReferenceReusedFromConfusingScope */
                 $value = \array_shift($arguments);
-            } elseif ($key === null || !\array_key_exists($name, $arguments)) {
-                if ($parameter->isOptional()) {
+            }
+            elseif ($key === null || !\array_key_exists($name, $arguments))
+            {
+                if ($parameter->isOptional())
+                {
                     continue;
                 }
                 throw new MissingRequiredArgumentException($reflection, $name);
-            } else {
+            }
+            else
+            {
                 $value = &$arguments[$name];
                 unset($arguments[$name]);
             }
 
-            if (!$this->validateValueToParameter($parameter, $value)) {
+            if (!$this->validateValueToParameter($parameter, $value))
+            {
                 throw new InvalidArgumentException($reflection, $name);
             }
         }
@@ -115,7 +128,8 @@ 
 
     private function validateValueToParameter(ReflectionParameter $parameter, mixed $value): bool
     {
-        if (!$parameter->hasType() || ($parameter->allowsNull() && $value === null)) {
+        if (!$parameter->hasType() || ($parameter->allowsNull() && $value === null))
+        {
             return true;
         }
         $type = $parameter->getType();
@@ -126,17 +140,21 @@ 
             $type instanceof ReflectionIntersectionType => [false, $type->getTypes()],
         };
 
-        foreach ($types as $t) {
+        foreach ($types as $t)
+        {
             \assert($t instanceof ReflectionNamedType);
-            if (!$this->validateValueNamedType($t, $value)) {
+            if (!$this->validateValueNamedType($t, $value))
+            {
                 // If it is TypeIntersection
-                if ($or) {
+                if ($or)
+                {
                     continue;
                 }
                 return false;
             }
             // If it is not type intersection then we can skip that value after first successful check
-            if ($or) {
+            if ($or)
+            {
                 return true;
             }
         }
@@ -151,7 +169,8 @@ 
     {
         $name = $type->getName();
 
-        if ($type->isBuiltin()) {
+        if ($type->isBuiltin())
+        {
             return match ($name) {
                 'mixed' => true,
                 'string' => \is_string($value),
@@ -184,13 +203,18 @@ 
 
         // Try to resolve parameter by name
         $res = $state->resolveParameterByNameOrPosition($param, $isVariadic);
-        if ($res !== [] || $isVariadic) {
+        if ($res !== [] || $isVariadic)
+        {
             // validate
-            if ($isVariadic) {
-                foreach ($res as $k => &$v) {
+            if ($isVariadic)
+            {
+                foreach ($res as $k => &$v)
+                {
                     $this->processArgument($state, $v, validateWith: $validate ? $param : null, key: $k);
                 }
-            } else {
+            }
+            else
+            {
                 $this->processArgument($state, $res[0], validateWith: $validate ? $param : null);
             }
 
@@ -198,41 +222,55 @@ 
         }
 
         $error = null;
-        while ($hasType) {
+        while ($hasType)
+        {
             /** @var ReflectionIntersectionType|ReflectionUnionType|ReflectionNamedType $refType */
             $refType = $param->getType();
 
-            if ($refType::class === ReflectionNamedType::class) {
-                if ($refType->isBuiltin()) {
+            if ($refType::class === ReflectionNamedType::class)
+            {
+                if ($refType->isBuiltin())
+                {
                     break;
                 }
 
                 if (\interface_exists($refType->getName()) && !empty(
                     $attrs = $param->getAttributes(ProxyAttribute::class)
-                )) {
+                ))
+                {
                     $proxy = Proxy::create(
                         new \ReflectionClass($refType->getName()), $param, $attrs[0]->newInstance());
                     $this->processArgument($state, $proxy);
                     return true;
                 }
 
-                try {
-                    if ($this->resolveObject($state, $refType, $param, $validate)) {
+                try
+                {
+                    if ($this->resolveObject($state, $refType, $param, $validate))
+                    {
                         return true;
                     }
-                } catch (Throwable $e) {
+                }
+                catch (Throwable $e)
+                {
                     $error = $e;
                 }
                 break;
             }
 
-            if ($refType::class === ReflectionUnionType::class) {
-                foreach ($refType->getTypes() as $namedType) {
-                    try {
-                        if (!$namedType->isBuiltin() && $this->resolveObject($state, $namedType, $param, $validate)) {
+            if ($refType::class === ReflectionUnionType::class)
+            {
+                foreach ($refType->getTypes() as $namedType)
+                {
+                    try
+                    {
+                        if (!$namedType->isBuiltin() && $this->resolveObject($state, $namedType, $param, $validate))
+                        {
                             return true;
                         }
-                    } catch (Throwable $e) {
+                    }
+                    catch (Throwable $e)
+                    {
                         $error = $e;
                     }
                 }
@@ -242,19 +280,22 @@ 
             throw new UnsupportedTypeException($param->getDeclaringFunction(), $param->getName());
         }
 
-        if ($param->isDefaultValueAvailable()) {
+        if ($param->isDefaultValueAvailable())
+        {
             $argument = $param->getDefaultValue();
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($hasType && $param->allowsNull()) {
+        if ($hasType && $param->allowsNull())
+        {
             $argument = null;
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($error === null) {
+        if ($error === null)
+        {
             return false;
         }
 
@@ -295,12 +336,14 @@ 
         int|string $key = null
     ): void {
         // Resolve Autowire objects
-        if ($value instanceof Autowire) {
+        if ($value instanceof Autowire)
+        {
             $value = $value->resolve($this->factory);
         }
 
         // Validation
-        if ($validateWith !== null && !$this->validateValueToParameter($validateWith, $value)) {
+        if ($validateWith !== null && !$this->validateValueToParameter($validateWith, $value))
+        {
             throw new InvalidArgumentException(
                 $validateWith->getDeclaringFunction(),
                 $validateWith->getName()

src/Core/src/Internal/Proxy.php

Spacing +8 added lines, -8 removed lines

@@ -22,7 +22,7 @@ 
      */
     public static function create(
         \ReflectionClass $type,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         \Spiral\Core\Attribute\Proxy $attribute,
     ): object {
         $interface = $type->getName();
@@ -37,9 +37,9 @@ 
             $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',
@@ -47,9 +47,9 @@ 
                     $type->getShortName(),
                     $n++ > 0 ? " {$n}" : ''
                 );
-            } while (\class_exists($className));
+            }while (\class_exists($className));
 
-            try {
+            try{
                 $classString = ProxyClassRenderer::renderClass(
                     $type,
                     $className,
@@ -58,7 +58,7 @@ 
                 );
 
                 eval($classString);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 throw new \Error("Unable to create proxy for `{$interface}`: {$e->getMessage()}", 0, $e);
             }
 
@@ -67,12 +67,12 @@ 
 
             // 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

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/ProxyTrait.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 trait ProxyTrait
 {
     private static string $__container_proxy_alias;
-    private \Stringable|string|null $__container_proxy_context = null;
+    private \Stringable | string | null $__container_proxy_context = null;
     private ?ContainerInterface $__container_proxy_container = null;
 }

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

Spacing +3 added lines, -3 removed lines

@@ -15,16 +15,16 @@
 {
     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{
             $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,

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,

src/Core/src/Internal/Proxy/ProxyClassRenderer.php

Spacing +20 added lines, -20 removed lines

@@ -27,24 +27,24 @@ 
             MagicCallTrait::class,
         ] : [];
 
-        if (\str_contains($className, '\\')) {
+        if (\str_contains($className, '\\')){
             $classShortName = \substr($className, \strrpos($className, '\\') + 1);
-            $classNamespaceStr = 'namespace ' . \substr($className, 0, \strrpos($className, '\\')) . ';';
-        } else {
+            $classNamespaceStr = 'namespace '.\substr($className, 0, \strrpos($className, '\\')).';';
+        }else{
             $classShortName = $className;
             $classNamespaceStr = '';
         }
 
         $interface = $type->getName();
         $classBody = [];
-        foreach ($type->getMethods() as $method) {
-            if ($method->isConstructor()) {
+        foreach ($type->getMethods() as $method){
+            if ($method->isConstructor()){
                 continue;
             }
 
             $hasRefs = false;
             $return = $method->hasReturnType() && (string)$method->getReturnType() === 'void' ? '' : 'return ';
-            $call = ($method->isStatic() ? '::' : '->') . $method->getName();
+            $call = ($method->isStatic() ? '::' : '->').$method->getName();
             $context = $method->isStatic() ? 'null' : '$this->__container_proxy_context';
             $containerStr = match (false) {
                 $attachContainer => 'null',
@@ -64,12 +64,12 @@ 
                 PHP;
 
             $args = [];
-            foreach ($method->getParameters() as $param) {
+            foreach ($method->getParameters() as $param){
                 $hasRefs = $hasRefs || $param->isPassedByReference();
-                $args[] = ($param->isVariadic() ? '...' : '') . '$' . $param->getName();
+                $args[] = ($param->isVariadic() ? '...' : '').'$'.$param->getName();
             }
 
-            if (!$hasRefs && !$method->isVariadic()) {
+            if (!$hasRefs && !$method->isVariadic()){
                 $classBody[] = self::renderMethod(
                     $method,
                     <<<PHP
@@ -81,7 +81,7 @@ 
 
             $argsStr = \implode(', ', $args);
 
-            if ($method->isVariadic()) {
+            if ($method->isVariadic()){
                 $classBody[] = self::renderMethod(
                     $method,
                     <<<PHP
@@ -103,7 +103,7 @@ 
 
         $traitsStr = $traits === [] ? '' : \implode(
             "\n    ",
-            \array_map(fn(string $trait): string => 'use \\' . \ltrim($trait, '\\') . ';', $traits)
+            \array_map(fn(string $trait) : string => 'use \\'.\ltrim($trait, '\\').';', $traits)
         );
         return <<<PHP
             $classNamespaceStr
@@ -126,7 +126,7 @@ 
             $m->getName(),
             \implode(', ', \array_map([self::class, 'renderParameter'], $m->getParameters())),
             $m->hasReturnType()
-                ? ': ' . self::renderParameterTypes($m->getReturnType(), $m->getDeclaringClass())
+                ? ': '.self::renderParameterTypes($m->getReturnType(), $m->getDeclaringClass())
                 : '',
             $body,
         );
@@ -140,8 +140,8 @@ 
                 $param->hasType() ? self::renderParameterTypes($param->getType(), $param->getDeclaringClass()) : '',
                 $param->isPassedByReference() ? '&' : '',
                 $param->isVariadic() ? '...' : '',
-                '$' . $param->getName(),
-                $param->isOptional() && !$param->isVariadic() ? ' = ' . self::renderDefaultValue($param) : '',
+                '$'.$param->getName(),
+                $param->isOptional() && !$param->isVariadic() ? ' = '.self::renderDefaultValue($param) : '',
             ),
             ' '
         );
@@ -149,8 +149,8 @@ 
 
     public static function renderParameterTypes(\ReflectionType $types, \ReflectionClass $class): string
     {
-        if ($types instanceof \ReflectionNamedType) {
-            return ($types->allowsNull() && $types->getName() !== 'mixed' ? '?' : '') . ($types->isBuiltin()
+        if ($types instanceof \ReflectionNamedType){
+            return ($types->allowsNull() && $types->getName() !== 'mixed' ? '?' : '').($types->isBuiltin()
                     ? $types->getName()
                     : self::normalizeClassType($types, $class));
         }
@@ -162,7 +162,7 @@ 
         };
 
         $result = [];
-        foreach ($types as $type) {
+        foreach ($types as $type){
             $result[] = $type->isBuiltin()
                 ? $type->getName()
                 : self::normalizeClassType($type, $class);
@@ -173,12 +173,12 @@ 
 
     public static function renderDefaultValue(\ReflectionParameter $param): string
     {
-        if ($param->isDefaultValueConstant()) {
+        if ($param->isDefaultValueConstant()){
             $result = $param->getDefaultValueConstantName();
 
             return \explode('::', $result)[0] === 'self'
                 ? $result
-                : '\\' . $result;
+                : '\\'.$result;
         }
 
         $cut = self::cutDefaultValue($param);
@@ -190,7 +190,7 @@ 
 
     public static function normalizeClassType(\ReflectionNamedType $type, \ReflectionClass $class): string
     {
-        return '\\' . ($type->getName() === 'self' ? $class->getName() : $type->getName());
+        return '\\'.($type->getName() === 'self' ? $class->getName() : $type->getName());
     }
 
     private static function cutDefaultValue(\ReflectionParameter $param): string

Braces +21 added lines, -10 removed lines

@@ -27,18 +27,23 @@ 
             MagicCallTrait::class,
         ] : [];
 
-        if (\str_contains($className, '\\')) {
+        if (\str_contains($className, '\\'))
+        {
             $classShortName = \substr($className, \strrpos($className, '\\') + 1);
             $classNamespaceStr = 'namespace ' . \substr($className, 0, \strrpos($className, '\\')) . ';';
-        } else {
+        }
+        else
+        {
             $classShortName = $className;
             $classNamespaceStr = '';
         }
 
         $interface = $type->getName();
         $classBody = [];
-        foreach ($type->getMethods() as $method) {
-            if ($method->isConstructor()) {
+        foreach ($type->getMethods() as $method)
+        {
+            if ($method->isConstructor())
+            {
                 continue;
             }
 
@@ -64,12 +69,14 @@ 
                 PHP;
 
             $args = [];
-            foreach ($method->getParameters() as $param) {
+            foreach ($method->getParameters() as $param)
+            {
                 $hasRefs = $hasRefs || $param->isPassedByReference();
                 $args[] = ($param->isVariadic() ? '...' : '') . '$' . $param->getName();
             }
 
-            if (!$hasRefs && !$method->isVariadic()) {
+            if (!$hasRefs && !$method->isVariadic())
+            {
                 $classBody[] = self::renderMethod(
                     $method,
                     <<<PHP
@@ -81,7 +88,8 @@ 
 
             $argsStr = \implode(', ', $args);
 
-            if ($method->isVariadic()) {
+            if ($method->isVariadic())
+            {
                 $classBody[] = self::renderMethod(
                     $method,
                     <<<PHP
@@ -149,7 +157,8 @@ 
 
     public static function renderParameterTypes(\ReflectionType $types, \ReflectionClass $class): string
     {
-        if ($types instanceof \ReflectionNamedType) {
+        if ($types instanceof \ReflectionNamedType)
+        {
             return ($types->allowsNull() && $types->getName() !== 'mixed' ? '?' : '') . ($types->isBuiltin()
                     ? $types->getName()
                     : self::normalizeClassType($types, $class));
@@ -162,7 +171,8 @@ 
         };
 
         $result = [];
-        foreach ($types as $type) {
+        foreach ($types as $type)
+        {
             $result[] = $type->isBuiltin()
                 ? $type->getName()
                 : self::normalizeClassType($type, $class);
@@ -173,7 +183,8 @@ 
 
     public static function renderDefaultValue(\ReflectionParameter $param): string
     {
-        if ($param->isDefaultValueConstant()) {
+        if ($param->isDefaultValueConstant())
+        {
             $result = $param->getDefaultValueConstantName();
 
             return \explode('::', $result)[0] === 'self'