spiral / framework

src/Events/src/Bootloader/EventsBootloader.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
 
     public function __construct(
         private readonly ConfiguratorInterface $configs
-    ) {
+    ){
     }
 
     public function init(): void
@@ -72,11 +72,11 @@ 
         FinalizerInterface $finalizer,
         ?EventDispatcherInterface $eventDispatcher = null
     ): void {
-        if ($eventDispatcher instanceof \Psr\EventDispatcher\EventDispatcherInterface) {
+        if ($eventDispatcher instanceof \Psr\EventDispatcher\EventDispatcherInterface){
             $this->initEventDispatcher(new Core($eventDispatcher), $config, $container, $factory);
         }
 
-        foreach ($config->getProcessors() as $processor) {
+        foreach ($config->getProcessors() as $processor){
             $processor = $this->autowire($processor, $container, $factory);
 
             \assert($processor instanceof ProcessorInterface);
@@ -87,7 +87,7 @@ 
             $registry->process();
         });
 
-        if ($finalizer instanceof EventDispatcherAwareInterface && $eventDispatcher instanceof \Psr\EventDispatcher\EventDispatcherInterface) {
+        if ($finalizer instanceof EventDispatcherAwareInterface && $eventDispatcher instanceof \Psr\EventDispatcher\EventDispatcherInterface){
             $finalizer->setEventDispatcher($eventDispatcher);
         }
     }
@@ -96,7 +96,7 @@ 
      * @param TInterceptor $interceptor
      */
     public function addInterceptor(
-        string|InterceptorInterface|CoreInterceptorInterface|Container\Autowire $interceptor,
+        string | InterceptorInterface | CoreInterceptorInterface | Container\Autowire $interceptor,
     ): void {
         $this->configs->modify(EventsConfig::CONFIG, new Append('interceptors', null, $interceptor));
     }
@@ -109,7 +109,7 @@ 
     ): void {
         $builder = new CompatiblePipelineBuilder();
         $list = [];
-        foreach ($config->getInterceptors() as $interceptor) {
+        foreach ($config->getInterceptors() as $interceptor){
             $list[] = $this->autowire($interceptor, $container, $factory);
         }
 
@@ -127,7 +127,7 @@ 
      *
      * @throws ContainerExceptionInterface
      */
-    private function autowire(string|object $id, ContainerInterface $container, FactoryInterface $factory): object
+    private function autowire(string | object $id, ContainerInterface $container, FactoryInterface $factory): object
     {
         return match (true) {
             \is_string($id) => $container->get($id),

Braces +8 added lines, -4 removed lines

@@ -72,11 +72,13 @@ 
         FinalizerInterface $finalizer,
         ?EventDispatcherInterface $eventDispatcher = null
     ): void {
-        if ($eventDispatcher instanceof \Psr\EventDispatcher\EventDispatcherInterface) {
+        if ($eventDispatcher instanceof \Psr\EventDispatcher\EventDispatcherInterface)
+        {
             $this->initEventDispatcher(new Core($eventDispatcher), $config, $container, $factory);
         }
 
-        foreach ($config->getProcessors() as $processor) {
+        foreach ($config->getProcessors() as $processor)
+        {
             $processor = $this->autowire($processor, $container, $factory);
 
             \assert($processor instanceof ProcessorInterface);
@@ -87,7 +89,8 @@ 
             $registry->process();
         });
 
-        if ($finalizer instanceof EventDispatcherAwareInterface && $eventDispatcher instanceof \Psr\EventDispatcher\EventDispatcherInterface) {
+        if ($finalizer instanceof EventDispatcherAwareInterface && $eventDispatcher instanceof \Psr\EventDispatcher\EventDispatcherInterface)
+        {
             $finalizer->setEventDispatcher($eventDispatcher);
         }
     }
@@ -109,7 +112,8 @@ 
     ): void {
         $builder = new CompatiblePipelineBuilder();
         $list = [];
-        foreach ($config->getInterceptors() as $interceptor) {
+        foreach ($config->getInterceptors() as $interceptor)
+        {
             $list[] = $this->autowire($interceptor, $container, $factory);
         }
 

src/Core/src/Internal/Factory.php

Spacing +68 added lines, -68 removed lines

@@ -68,19 +68,19 @@ 
      *
      * @throws \Throwable
      */
-    public function make(string $alias, array $parameters = [], Stringable|string|null $context = null): mixed
+    public function make(string $alias, array $parameters = [], Stringable | string | null $context = null): mixed
     {
-        if ($parameters === [] && \array_key_exists($alias, $this->state->singletons)) {
+        if ($parameters === [] && \array_key_exists($alias, $this->state->singletons)){
             return $this->state->singletons[$alias];
         }
 
         $binding = $this->state->bindings[$alias] ?? null;
 
-        if ($binding === null) {
+        if ($binding === null){
             return $this->resolveWithoutBinding($alias, $parameters, $context);
         }
 
-        try {
+        try{
             $this->tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -110,7 +110,7 @@ 
                     ->resolveWeakReference($binding, $alias, $context, $parameters),
                 default => $binding,
             };
-        } finally {
+        }finally{
             $this->state->bindings[$alias] ??= $binding;
             $this->tracer->pop(true);
             $this->tracer->pop(false);
@@ -124,18 +124,18 @@ 
     private function resolveInjector(Config\Injectable $binding, Ctx $ctx, array $arguments)
     {
         $context = $ctx->context;
-        try {
+        try{
             $reflection = $ctx->reflection ??= new \ReflectionClass($ctx->class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         $injector = $binding->injector;
 
-        try {
+        try{
             $injectorInstance = \is_object($injector) ? $injector : $this->container->get($injector);
 
-            if (!$injectorInstance instanceof InjectorInterface) {
+            if (!$injectorInstance instanceof InjectorInterface){
                 throw new InjectionException(
                     \sprintf(
                         "Class '%s' must be an instance of InjectorInterface for '%s'.",
@@ -162,7 +162,7 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance)){
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -172,7 +172,7 @@ 
             }
 
             return $instance;
-        } finally {
+        }finally{
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -180,27 +180,27 @@ 
     private function resolveAlias(
         Config\Alias $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): mixed {
         $result = $binding->alias === $alias
             ? $this->autowire(
-                new Ctx(alias: $alias, class: $binding->alias, context: $context, singleton: $binding->singleton),
+                new Ctx(alias : $alias, class : $binding->alias, context : $context, singleton : $binding->singleton),
                 $arguments,
             )
             //Binding is pointing to something else
             : $this->make($binding->alias, $arguments, $context);
 
-        if ($binding->singleton && $arguments === []) {
+        if ($binding->singleton && $arguments === []){
             $this->state->singletons[$alias] = $result;
         }
 
         return $result;
     }
 
-    private function resolveProxy(Config\Proxy $binding, string $alias, Stringable|string|null $context): mixed
+    private function resolveProxy(Config\Proxy $binding, string $alias, Stringable | string | null $context): mixed
     {
-        if ($context instanceof RetryContext) {
+        if ($context instanceof RetryContext){
             return $binding->fallbackFactory instanceof \Closure
                 ? ($binding->fallbackFactory)($this->container, $context->context)
                 : throw new RecursiveProxyException(
@@ -211,7 +211,7 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getInterface()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $result;
         }
 
@@ -221,13 +221,13 @@ 
     private function resolveShared(
         Config\Shared $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): object {
         $avoidCache = $arguments !== [];
         return $avoidCache
             ? $this->createInstance(
-                new Ctx(alias: $alias, class: $binding->value::class, context: $context),
+                new Ctx(alias : $alias, class : $binding->value::class, context : $context),
                 $arguments,
             )
             : $binding->value;
@@ -236,7 +236,7 @@ 
     private function resolveAutowire(
         Config\Autowire $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): mixed {
         $target = $binding->autowire->alias;
@@ -250,17 +250,17 @@ 
     }
 
     private function resolveFactory(
-        Config\Factory|Config\DeferredFactory $binding,
+        Config\Factory | Config\DeferredFactory $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton);
-        try {
+        try{
             $instance = $binding::class === Config\Factory::class && $binding->getParametersCount() === 0
                 ? ($binding->factory)()
                 : $this->invoker->invoke($binding->factory, $arguments);
-        } catch (NotCallableException $e) {
+        }catch (NotCallableException $e){
             throw new ContainerException(
                 $this->tracer->combineTraceMessage(\sprintf('Invalid binding for `%s`.', $ctx->alias)),
                 $e->getCode(),
@@ -274,24 +274,24 @@ 
     private function resolveWeakReference(
         Config\WeakReference $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): ?object {
         $avoidCache = $arguments !== [];
 
-        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)){
+            try{
                 $this->tracer->push(false, alias: $alias, source: WeakReference::class, context: $context);
 
                 $object = $this->createInstance(
                     new Ctx(alias: $alias, class: $alias, context: $context),
                     $arguments,
                 );
-                if ($avoidCache) {
+                if ($avoidCache){
                     return $object;
                 }
                 $binding->reference = WeakReference::create($object);
-            } catch (\Throwable) {
+            }catch (\Throwable){
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -301,7 +301,7 @@ 
                         )
                     )
                 );
-            } finally {
+            }finally{
                 $this->tracer->pop();
             }
         }
@@ -312,23 +312,23 @@ 
     private function resolveWithoutBinding(
         string $alias,
         array $parameters = [],
-        Stringable|string|null $context = null
+        Stringable | string | null $context = null
     ): mixed {
         $parent = $this->scope->getParentFactory();
 
-        if ($parent instanceof \Spiral\Core\FactoryInterface) {
-            try {
+        if ($parent instanceof \Spiral\Core\FactoryInterface){
+            try{
                 $this->tracer->push(false, ...[
                     'current scope' => $this->scope->getScopeName(),
                     'jump to parent scope' => $this->scope->getParentScope()->getScopeName(),
                 ]);
                 /** @psalm-suppress TooManyArguments */
                 return $parent->make($alias, $parameters, $context);
-            } catch (BadScopeException $e) {
-                if ($this->scope->getScopeName() !== $e->getScope()) {
+            }catch (BadScopeException $e){
+                if ($this->scope->getScopeName() !== $e->getScope()){
                     throw $e;
                 }
-            } catch (ContainerExceptionInterface $e) {
+            }catch (ContainerExceptionInterface $e){
                 $className = match (true) {
                     $e instanceof NotFoundException => NotFoundException::class,
                     $e instanceof RecursiveProxyException => throw $e,
@@ -338,19 +338,19 @@ 
                     'Can\'t resolve `%s`.',
                     $alias,
                 )), previous: $e);
-            } finally {
+            }finally{
                 $this->tracer->pop(false);
             }
         }
 
         $this->tracer->push(false, action: 'autowire', alias: $alias, context: $context);
-        try {
+        try{
             //No direct instructions how to construct class, make is automatically
             return $this->autowire(
                 new Ctx(alias: $alias, class: $alias, context: $context),
                 $parameters,
             );
-        } finally {
+        }finally{
             $this->tracer->pop(false);
         }
     }
@@ -371,7 +371,7 @@ 
                 &&
                 (isset($this->state->injectors[$ctx->class]) || $this->binder->hasInjector($ctx->class))
         ))
-        ) {
+        ){
             throw new NotFoundException($this->tracer->combineTraceMessage(\sprintf(
                 'Can\'t resolve `%s`: undefined class or binding `%s`.',
                 $this->tracer->getRootAlias(),
@@ -397,13 +397,13 @@ 
         Ctx $ctx,
         array $arguments,
     ): object {
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope){
             // Check scope name
             $ctx->reflection = new \ReflectionClass($instance);
             $scopeName = ($ctx->reflection->getAttributes(Attribute\Scope::class)[0] ?? null)?->newInstance()->name;
-            if ($scopeName !== null) {
+            if ($scopeName !== null){
                 $scope = $this->scope;
-                while ($scope->getScopeName() !== $scopeName) {
+                while ($scope->getScopeName() !== $scopeName){
                     $scope = $scope->getParentScope() ?? throw new BadScopeException($scopeName, $instance::class);
                 }
             }
@@ -432,26 +432,26 @@ 
         array $arguments,
     ): object {
         $class = $ctx->class;
-        try {
+        try{
             $ctx->reflection = $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         // Check scope name
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope){
             $scope = ($reflection->getAttributes(Attribute\Scope::class)[0] ?? null)?->newInstance()->name;
-            if ($scope !== null && $scope !== $this->scope->getScopeName()) {
+            if ($scope !== null && $scope !== $this->scope->getScopeName()){
                 throw new BadScopeException($scope, $class);
             }
         }
 
         // We have to construct class using external injector when we know the exact context
-        if ($arguments === [] && $this->binder->hasInjector($class)) {
+        if ($arguments === [] && $this->binder->hasInjector($class)){
             return $this->resolveInjector($this->state->bindings[$ctx->class], $ctx, $arguments);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -464,12 +464,12 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null){
+            try{
                 $this->tracer->push(false, action: 'resolve arguments', signature: $constructor);
                 $this->tracer->push(true);
                 $args = $this->resolver->resolveArguments($constructor, $arguments, $this->options->validateArguments);
-            } catch (ValidationException $e) {
+            }catch (ValidationException $e){
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -479,22 +479,22 @@ 
                         )
                     ),
                 );
-            } finally {
+            }finally{
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-            try {
+            try{
                 // Using constructor with resolved arguments
                 $this->tracer->push(false, call: "$class::__construct", arguments: $args);
                 $this->tracer->push(true);
                 $instance = new $class(...$args);
-            } catch (\TypeError $e) {
+            }catch (\TypeError $e){
                 throw new WrongTypeException($constructor, $e);
-            } finally {
+            }finally{
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-        } else {
+        }else{
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -512,13 +512,13 @@ 
         $instance = $this->runInflector($instance);
 
         //Declarative singletons
-        if ($this->isSingleton($ctx)) {
+        if ($this->isSingleton($ctx)){
             $this->state->singletons[$ctx->alias] = $instance;
         }
 
         // Register finalizer
         $finalizer = $this->getFinalizer($ctx, $instance);
-        if ($finalizer !== null) {
+        if ($finalizer !== null){
             $this->state->finalizers[] = $finalizer;
         }
 
@@ -530,12 +530,12 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if ($ctx->singleton === true) {
+        if ($ctx->singleton === true){
             return true;
         }
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class)){
             return true;
         }
 
@@ -549,7 +549,7 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 
@@ -563,10 +563,10 @@ 
     {
         $scope = $this->scope;
 
-        while ($scope instanceof \Spiral\Core\Internal\Scope) {
-            foreach ($this->state->inflectors as $class => $inflectors) {
-                if ($instance instanceof $class) {
-                    foreach ($inflectors as $inflector) {
+        while ($scope instanceof \Spiral\Core\Internal\Scope){
+            foreach ($this->state->inflectors as $class => $inflectors){
+                if ($instance instanceof $class){
+                    foreach ($inflectors as $inflector){
                         $instance = $inflector->getParametersCount() > 1
                             ? $this->invoker->invoke($inflector->inflector, [$instance])
                             : ($inflector->inflector)($instance);
@@ -582,9 +582,9 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try{
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
 

Braces +129 added lines, -56 removed lines

@@ -70,17 +70,20 @@ 
      */
     public function make(string $alias, array $parameters = [], Stringable|string|null $context = null): mixed
     {
-        if ($parameters === [] && \array_key_exists($alias, $this->state->singletons)) {
+        if ($parameters === [] && \array_key_exists($alias, $this->state->singletons))
+        {
             return $this->state->singletons[$alias];
         }
 
         $binding = $this->state->bindings[$alias] ?? null;
 
-        if ($binding === null) {
+        if ($binding === null)
+        {
             return $this->resolveWithoutBinding($alias, $parameters, $context);
         }
 
-        try {
+        try
+        {
             $this->tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -110,7 +113,9 @@ 
                     ->resolveWeakReference($binding, $alias, $context, $parameters),
                 default => $binding,
             };
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$alias] ??= $binding;
             $this->tracer->pop(true);
             $this->tracer->pop(false);
@@ -124,18 +129,23 @@ 
     private function resolveInjector(Config\Injectable $binding, Ctx $ctx, array $arguments)
     {
         $context = $ctx->context;
-        try {
+        try
+        {
             $reflection = $ctx->reflection ??= new \ReflectionClass($ctx->class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         $injector = $binding->injector;
 
-        try {
+        try
+        {
             $injectorInstance = \is_object($injector) ? $injector : $this->container->get($injector);
 
-            if (!$injectorInstance instanceof InjectorInterface) {
+            if (!$injectorInstance instanceof InjectorInterface)
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Class '%s' must be an instance of InjectorInterface for '%s'.",
@@ -162,7 +172,8 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -172,7 +183,9 @@ 
             }
 
             return $instance;
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -191,7 +204,8 @@ 
             //Binding is pointing to something else
             : $this->make($binding->alias, $arguments, $context);
 
-        if ($binding->singleton && $arguments === []) {
+        if ($binding->singleton && $arguments === [])
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -200,7 +214,8 @@ 
 
     private function resolveProxy(Config\Proxy $binding, string $alias, Stringable|string|null $context): mixed
     {
-        if ($context instanceof RetryContext) {
+        if ($context instanceof RetryContext)
+        {
             return $binding->fallbackFactory instanceof \Closure
                 ? ($binding->fallbackFactory)($this->container, $context->context)
                 : throw new RecursiveProxyException(
@@ -211,7 +226,8 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getInterface()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -256,11 +272,14 @@ 
         array $arguments,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton);
-        try {
+        try
+        {
             $instance = $binding::class === Config\Factory::class && $binding->getParametersCount() === 0
                 ? ($binding->factory)()
                 : $this->invoker->invoke($binding->factory, $arguments);
-        } catch (NotCallableException $e) {
+        }
+        catch (NotCallableException $e)
+        {
             throw new ContainerException(
                 $this->tracer->combineTraceMessage(\sprintf('Invalid binding for `%s`.', $ctx->alias)),
                 $e->getCode(),
@@ -279,19 +298,24 @@ 
     ): ?object {
         $avoidCache = $arguments !== [];
 
-        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias))
+        {
+            try
+            {
                 $this->tracer->push(false, alias: $alias, source: WeakReference::class, context: $context);
 
                 $object = $this->createInstance(
                     new Ctx(alias: $alias, class: $alias, context: $context),
                     $arguments,
                 );
-                if ($avoidCache) {
+                if ($avoidCache)
+                {
                     return $object;
                 }
                 $binding->reference = WeakReference::create($object);
-            } catch (\Throwable) {
+            }
+            catch (\Throwable)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -301,7 +325,9 @@ 
                         )
                     )
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop();
             }
         }
@@ -316,19 +342,26 @@ 
     ): mixed {
         $parent = $this->scope->getParentFactory();
 
-        if ($parent instanceof \Spiral\Core\FactoryInterface) {
-            try {
+        if ($parent instanceof \Spiral\Core\FactoryInterface)
+        {
+            try
+            {
                 $this->tracer->push(false, ...[
                     'current scope' => $this->scope->getScopeName(),
                     'jump to parent scope' => $this->scope->getParentScope()->getScopeName(),
                 ]);
                 /** @psalm-suppress TooManyArguments */
                 return $parent->make($alias, $parameters, $context);
-            } catch (BadScopeException $e) {
-                if ($this->scope->getScopeName() !== $e->getScope()) {
+            }
+            catch (BadScopeException $e)
+            {
+                if ($this->scope->getScopeName() !== $e->getScope())
+                {
                     throw $e;
                 }
-            } catch (ContainerExceptionInterface $e) {
+            }
+            catch (ContainerExceptionInterface $e)
+            {
                 $className = match (true) {
                     $e instanceof NotFoundException => NotFoundException::class,
                     $e instanceof RecursiveProxyException => throw $e,
@@ -338,19 +371,24 @@ 
                     'Can\'t resolve `%s`.',
                     $alias,
                 )), previous: $e);
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(false);
             }
         }
 
         $this->tracer->push(false, action: 'autowire', alias: $alias, context: $context);
-        try {
+        try
+        {
             //No direct instructions how to construct class, make is automatically
             return $this->autowire(
                 new Ctx(alias: $alias, class: $alias, context: $context),
                 $parameters,
             );
-        } finally {
+        }
+        finally
+        {
             $this->tracer->pop(false);
         }
     }
@@ -397,13 +435,16 @@ 
         Ctx $ctx,
         array $arguments,
     ): object {
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope)
+        {
             // Check scope name
             $ctx->reflection = new \ReflectionClass($instance);
             $scopeName = ($ctx->reflection->getAttributes(Attribute\Scope::class)[0] ?? null)?->newInstance()->name;
-            if ($scopeName !== null) {
+            if ($scopeName !== null)
+            {
                 $scope = $this->scope;
-                while ($scope->getScopeName() !== $scopeName) {
+                while ($scope->getScopeName() !== $scopeName)
+                {
                     $scope = $scope->getParentScope() ?? throw new BadScopeException($scopeName, $instance::class);
                 }
             }
@@ -432,26 +473,33 @@ 
         array $arguments,
     ): object {
         $class = $ctx->class;
-        try {
+        try
+        {
             $ctx->reflection = $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         // Check scope name
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope)
+        {
             $scope = ($reflection->getAttributes(Attribute\Scope::class)[0] ?? null)?->newInstance()->name;
-            if ($scope !== null && $scope !== $this->scope->getScopeName()) {
+            if ($scope !== null && $scope !== $this->scope->getScopeName())
+            {
                 throw new BadScopeException($scope, $class);
             }
         }
 
         // We have to construct class using external injector when we know the exact context
-        if ($arguments === [] && $this->binder->hasInjector($class)) {
+        if ($arguments === [] && $this->binder->hasInjector($class))
+        {
             return $this->resolveInjector($this->state->bindings[$ctx->class], $ctx, $arguments);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -464,12 +512,16 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 $this->tracer->push(false, action: 'resolve arguments', signature: $constructor);
                 $this->tracer->push(true);
                 $args = $this->resolver->resolveArguments($constructor, $arguments, $this->options->validateArguments);
-            } catch (ValidationException $e) {
+            }
+            catch (ValidationException $e)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -479,22 +531,31 @@ 
                         )
                     ),
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-            try {
+            try
+            {
                 // Using constructor with resolved arguments
                 $this->tracer->push(false, call: "$class::__construct", arguments: $args);
                 $this->tracer->push(true);
                 $instance = new $class(...$args);
-            } catch (\TypeError $e) {
+            }
+            catch (\TypeError $e)
+            {
                 throw new WrongTypeException($constructor, $e);
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -512,13 +573,15 @@ 
         $instance = $this->runInflector($instance);
 
         //Declarative singletons
-        if ($this->isSingleton($ctx)) {
+        if ($this->isSingleton($ctx))
+        {
             $this->state->singletons[$ctx->alias] = $instance;
         }
 
         // Register finalizer
         $finalizer = $this->getFinalizer($ctx, $instance);
-        if ($finalizer !== null) {
+        if ($finalizer !== null)
+        {
             $this->state->finalizers[] = $finalizer;
         }
 
@@ -530,12 +593,14 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if ($ctx->singleton === true) {
+        if ($ctx->singleton === true)
+        {
             return true;
         }
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class))
+        {
             return true;
         }
 
@@ -549,7 +614,8 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -563,10 +629,14 @@ 
     {
         $scope = $this->scope;
 
-        while ($scope instanceof \Spiral\Core\Internal\Scope) {
-            foreach ($this->state->inflectors as $class => $inflectors) {
-                if ($instance instanceof $class) {
-                    foreach ($inflectors as $inflector) {
+        while ($scope instanceof \Spiral\Core\Internal\Scope)
+        {
+            foreach ($this->state->inflectors as $class => $inflectors)
+            {
+                if ($instance instanceof $class)
+                {
+                    foreach ($inflectors as $inflector)
+                    {
                         $instance = $inflector->getParametersCount() > 1
                             ? $this->invoker->invoke($inflector->inflector, [$instance])
                             : ($inflector->inflector)($instance);
@@ -582,9 +652,12 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try
+        {
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             return false;
         }
 

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,18 +198,18 @@ 
         }
 
         $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,
@@ -219,23 +219,23 @@ 
                     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;
                     }
                 }
@@ -245,19 +245,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 instanceof \Throwable) {
+        if (!$error instanceof \Throwable){
             return false;
         }
 
@@ -295,15 +295,15 @@ 
         ResolvingState $state,
         mixed &$value,
         ?ReflectionParameter $validateWith = null,
-        int|string|null $key = null
+        int | string | null $key = null
     ): void {
         // Resolve Autowire objects
-        if ($value instanceof Autowire) {
+        if ($value instanceof Autowire){
             $value = $value->resolve($this->factory);
         }
 
         // Validation
-        if ($validateWith instanceof \ReflectionParameter && !$this->validateValueToParameter($validateWith, $value)) {
+        if ($validateWith instanceof \ReflectionParameter && !$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,18 +222,22 @@ 
         }
 
         $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,
@@ -219,23 +247,33 @@ 
                     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;
                     }
                 }
@@ -245,19 +283,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 instanceof \Throwable) {
+        if (!$error instanceof \Throwable)
+        {
             return false;
         }
 
@@ -298,12 +339,14 @@ 
         int|string|null $key = null
     ): void {
         // Resolve Autowire objects
-        if ($value instanceof Autowire) {
+        if ($value instanceof Autowire)
+        {
             $value = $value->resolve($this->factory);
         }
 
         // Validation
-        if ($validateWith instanceof \ReflectionParameter && !$this->validateValueToParameter($validateWith, $value)) {
+        if ($validateWith instanceof \ReflectionParameter && !$this->validateValueToParameter($validateWith, $value))
+        {
             throw new InvalidArgumentException(
                 $validateWith->getDeclaringFunction(),
                 $validateWith->getName()

src/Core/src/Internal/Binder.php

Spacing +2 added lines, -2 removed lines

@@ -32,11 +32,11 @@
     public function hasInstance(string $alias): bool
     {
         $parent = $this->scope->getParent();
-        if ($parent instanceof \Spiral\Core\Container && $parent->hasInstance($alias)) {
+        if ($parent instanceof \Spiral\Core\Container && $parent->hasInstance($alias)){
             return true;
         }
 
-        if (!$this->container->has($alias)) {
+        if (!$this->container->has($alias)){
             return false;
         }
 

Braces +4 added lines, -2 removed lines

@@ -32,11 +32,13 @@
     public function hasInstance(string $alias): bool
     {
         $parent = $this->scope->getParent();
-        if ($parent instanceof \Spiral\Core\Container && $parent->hasInstance($alias)) {
+        if ($parent instanceof \Spiral\Core\Container && $parent->hasInstance($alias))
+        {
             return true;
         }
 
-        if (!$this->container->has($alias)) {
+        if (!$this->container->has($alias))
+        {
             return false;
         }
 

src/Core/src/Internal/Scope.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
 
     public function __construct(
         private readonly ?string $scopeName = null,
-    ) {
+    ){
     }
 
     public function getScopeName(): ?string
@@ -38,9 +38,9 @@ 
         $this->parentFactory = $factory;
 
         // Check a scope with the same name is not already registered
-        if ($this->scopeName !== null) {
+        if ($this->scopeName !== null){
             $tmp = $this;
-            while ($tmp->parentScope instanceof \Spiral\Core\Internal\Scope) {
+            while ($tmp->parentScope instanceof \Spiral\Core\Internal\Scope){
                 $tmp = $tmp->parentScope;
                 $tmp->scopeName !== $this->scopeName ?: throw new NamedScopeDuplicationException($this->scopeName);
             }
@@ -68,7 +68,7 @@ 
         $result = [$this->scopeName];
 
         $parent = $this;
-        while ($parent->parentScope instanceof \Spiral\Core\Internal\Scope) {
+        while ($parent->parentScope instanceof \Spiral\Core\Internal\Scope){
             $parent = $parent->parentScope;
             $result[] = $parent->scopeName;
         }

Braces +6 added lines, -3 removed lines

@@ -38,9 +38,11 @@ 
         $this->parentFactory = $factory;
 
         // Check a scope with the same name is not already registered
-        if ($this->scopeName !== null) {
+        if ($this->scopeName !== null)
+        {
             $tmp = $this;
-            while ($tmp->parentScope instanceof \Spiral\Core\Internal\Scope) {
+            while ($tmp->parentScope instanceof \Spiral\Core\Internal\Scope)
+            {
                 $tmp = $tmp->parentScope;
                 $tmp->scopeName !== $this->scopeName ?: throw new NamedScopeDuplicationException($this->scopeName);
             }
@@ -68,7 +70,8 @@ 
         $result = [$this->scopeName];
 
         $parent = $this;
-        while ($parent->parentScope instanceof \Spiral\Core\Internal\Scope) {
+        while ($parent->parentScope instanceof \Spiral\Core\Internal\Scope)
+        {
             $parent = $parent->parentScope;
             $result[] = $parent->scopeName;
         }

src/Core/src/Internal/Tracer.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 
     public function __toString(): string
     {
-        return $this->traces === [] ? '' : "Container trace list:\n" . $this->renderTraceList($this->traces);
+        return $this->traces === [] ? '' : "Container trace list:\n".$this->renderTraceList($this->traces);
     }
 
     /**
@@ -34,19 +34,19 @@ 
     public function push(bool $nextLevel, mixed ...$details): void
     {
         $trace = $details === [] ? null : new Trace($details);
-        if ($nextLevel || $this->traces === []) {
+        if ($nextLevel || $this->traces === []){
             $this->traces[] = $trace instanceof \Spiral\Core\Internal\Tracer\Trace ? [$trace] : [];
-        } elseif ($trace instanceof \Spiral\Core\Internal\Tracer\Trace) {
+        } elseif ($trace instanceof \Spiral\Core\Internal\Tracer\Trace){
             $this->traces[\array_key_last($this->traces)][] = $trace;
         }
     }
 
     public function pop(bool $previousLevel = false): void
     {
-        if ($this->traces === []) {
+        if ($this->traces === []){
             return;
         }
-        if ($previousLevel) {
+        if ($previousLevel){
             \array_pop($this->traces);
             return;
         }
@@ -67,7 +67,7 @@ 
     {
         $result = [];
         $i = 0;
-        foreach ($blocks as $block) {
+        foreach ($blocks as $block){
             \array_push($result, ...$this->blockToStringList($block, $i++));
         }
         return \implode("\n", $result);
@@ -87,8 +87,8 @@ 
         // Separator
         $s = "\n";
         $nexPrefix = "$s$padding  ";
-        foreach ($items as $item) {
-            $result[] = $firstPrefix . \str_replace($s, $nexPrefix, (string)$item);
+        foreach ($items as $item){
+            $result[] = $firstPrefix.\str_replace($s, $nexPrefix, (string)$item);
         }
         return $result;
     }

Braces +13 added lines, -6 removed lines

@@ -34,19 +34,24 @@ 
     public function push(bool $nextLevel, mixed ...$details): void
     {
         $trace = $details === [] ? null : new Trace($details);
-        if ($nextLevel || $this->traces === []) {
+        if ($nextLevel || $this->traces === [])
+        {
             $this->traces[] = $trace instanceof \Spiral\Core\Internal\Tracer\Trace ? [$trace] : [];
-        } elseif ($trace instanceof \Spiral\Core\Internal\Tracer\Trace) {
+        }
+        elseif ($trace instanceof \Spiral\Core\Internal\Tracer\Trace)
+        {
             $this->traces[\array_key_last($this->traces)][] = $trace;
         }
     }
 
     public function pop(bool $previousLevel = false): void
     {
-        if ($this->traces === []) {
+        if ($this->traces === [])
+        {
             return;
         }
-        if ($previousLevel) {
+        if ($previousLevel)
+        {
             \array_pop($this->traces);
             return;
         }
@@ -67,7 +72,8 @@ 
     {
         $result = [];
         $i = 0;
-        foreach ($blocks as $block) {
+        foreach ($blocks as $block)
+        {
             \array_push($result, ...$this->blockToStringList($block, $i++));
         }
         return \implode("\n", $result);
@@ -87,7 +93,8 @@ 
         // Separator
         $s = "\n";
         $nexPrefix = "$s$padding  ";
-        foreach ($items as $item) {
+        foreach ($items as $item)
+        {
             $result[] = $firstPrefix . \str_replace($s, $nexPrefix, (string)$item);
         }
         return $result;

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() instanceof \Fiber) {
+        try{
+            if (!Fiber::getCurrent() instanceof \Fiber){
                 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() instanceof \Fiber) {
+        try
+        {
+            if (!Fiber::getCurrent() instanceof \Fiber)
+            {
                 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;
         }
     }

src/Stempler/tests/Transform/BaseTestCase.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 {
     protected function compile(string $source, array $visitors = [], ?LoaderInterface $loader = null)
     {
-        if (!$loader instanceof \Spiral\Stempler\Loader\LoaderInterface) {
+        if (!$loader instanceof \Spiral\Stempler\Loader\LoaderInterface){
             $loader = new StringLoader();
             $loader->set('root', $source);
         }
@@ -62,11 +62,11 @@ 
         $builder->getCompiler()->addRenderer(new DynamicRenderer(new DirectiveGroup()));
         $builder->getCompiler()->addRenderer(new HTMLRenderer());
 
-        foreach ($this->getVisitors() as $visitor) {
+        foreach ($this->getVisitors() as $visitor){
             $builder->addVisitor($visitor);
         }
 
-        foreach ($visitors as $visitor) {
+        foreach ($visitors as $visitor){
             $builder->addVisitor($visitor);
         }
 
@@ -80,6 +80,6 @@ 
 
     protected function getFixtureLoader(): LoaderInterface
     {
-        return new DirectoryLoader(__DIR__ . '/../fixtures');
+        return new DirectoryLoader(__DIR__.'/../fixtures');
     }
 }

Braces +6 added lines, -3 removed lines

@@ -27,7 +27,8 @@ 
 {
     protected function compile(string $source, array $visitors = [], ?LoaderInterface $loader = null)
     {
-        if (!$loader instanceof \Spiral\Stempler\Loader\LoaderInterface) {
+        if (!$loader instanceof \Spiral\Stempler\Loader\LoaderInterface)
+        {
             $loader = new StringLoader();
             $loader->set('root', $source);
         }
@@ -62,11 +63,13 @@ 
         $builder->getCompiler()->addRenderer(new DynamicRenderer(new DirectiveGroup()));
         $builder->getCompiler()->addRenderer(new HTMLRenderer());
 
-        foreach ($this->getVisitors() as $visitor) {
+        foreach ($this->getVisitors() as $visitor)
+        {
             $builder->addVisitor($visitor);
         }
 
-        foreach ($visitors as $visitor) {
+        foreach ($visitors as $visitor)
+        {
             $builder->addVisitor($visitor);
         }
 

src/Stempler/src/Transform/Import/Bundle.php

Spacing +6 added lines, -6 removed lines

@@ -23,19 +23,19 @@ 
         private string $path,
         private ?string $prefix = null,
         ?Context $context = null,
-    ) {
+    ){
         $this->context = $context;
     }
 
     public function resolve(Builder $builder, string $name): ?Template
     {
-        if (!$this->template instanceof \Spiral\Stempler\Node\Template) {
+        if (!$this->template instanceof \Spiral\Stempler\Node\Template){
             $this->template = $builder->load($this->path);
         }
 
         $path = $name;
-        if ($this->prefix !== null) {
-            if (!TagHelper::hasPrefix($name, $this->prefix)) {
+        if ($this->prefix !== null){
+            if (!TagHelper::hasPrefix($name, $this->prefix)){
                 return null;
             }
 
@@ -43,9 +43,9 @@ 
         }
 
         /** @var ImportInterface $import */
-        foreach ($this->template->getAttribute(ImportContext::class, []) as $import) {
+        foreach ($this->template->getAttribute(ImportContext::class, []) as $import){
             $tpl = $import->resolve($builder, $path);
-            if ($tpl !== null) {
+            if ($tpl !== null){
                 return $tpl;
             }
         }

Braces +10 added lines, -5 removed lines

@@ -29,13 +29,16 @@ 
 
     public function resolve(Builder $builder, string $name): ?Template
     {
-        if (!$this->template instanceof \Spiral\Stempler\Node\Template) {
+        if (!$this->template instanceof \Spiral\Stempler\Node\Template)
+        {
             $this->template = $builder->load($this->path);
         }
 
         $path = $name;
-        if ($this->prefix !== null) {
-            if (!TagHelper::hasPrefix($name, $this->prefix)) {
+        if ($this->prefix !== null)
+        {
+            if (!TagHelper::hasPrefix($name, $this->prefix))
+            {
                 return null;
             }
 
@@ -43,9 +46,11 @@ 
         }
 
         /** @var ImportInterface $import */
-        foreach ($this->template->getAttribute(ImportContext::class, []) as $import) {
+        foreach ($this->template->getAttribute(ImportContext::class, []) as $import)
+        {
             $tpl = $import->resolve($builder, $path);
-            if ($tpl !== null) {
+            if ($tpl !== null)
+            {
                 return $tpl;
             }
         }