spiral / framework

src/Core/src/Exception/Container/TracedContainerException.php

Spacing +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@ 
         ?\Throwable $previous = null,
     ): static {
         $result = new static(
-            $message . ($traces === [] ? '' : "\nResolving trace:\n" . Tracer::renderTraceList($traces)),
-            previous: $previous,
+            $message.($traces === [] ? '' : "\nResolving trace:\n".Tracer::renderTraceList($traces)),
+            previous : $previous,
         );
         $result->originalMessage = $message;
         $result->containerTrace = $traces;
@@ -37,7 +37,7 @@ 
     public static function extendTracedException(string $message, array $traces, self $exception): static
     {
         $merge = $exception->containerTrace;
-        if ($traces !== [] && $merge !== []) {
+        if ($traces !== [] && $merge !== []){
             // merge lat element of $traces with first element of $merge
             \array_push($traces[\count($traces) - 1], ...$merge[0]);
             unset($merge[0]);

Braces +2 added lines, -1 removed lines

@@ -37,7 +37,8 @@
     public static function extendTracedException(string $message, array $traces, self $exception): static
     {
         $merge = $exception->containerTrace;
-        if ($traces !== [] && $merge !== []) {
+        if ($traces !== [] && $merge !== [])
+        {
             // merge lat element of $traces with first element of $merge
             \array_push($traces[\count($traces) - 1], ...$merge[0]);
             unset($merge[0]);

src/Core/src/Exception/Container/AutowireException.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
 /**
  * When class can not be created.
  */
-class AutowireException extends TracedContainerException {}
+class AutowireException extends TracedContainerException{}

Braces +3 added lines, -1 removed lines

@@ -7,4 +7,6 @@
 /**
  * When class can not be created.
  */
-class AutowireException extends TracedContainerException {}
+class AutowireException extends TracedContainerException
+{
+}

src/Core/tests/Internal/Resolver/NullableParameterTest.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
     public function testNullableUnionDefaultScalar(): void
     {
         $result = $this->resolveClosure(
-            static fn(null|int|string $param = 42) => $param,
+            static fn(null | int | string $param = 42) => $param,
         );
 
         $this->assertSame([42], $result);
@@ -103,12 +103,12 @@ 
     {
         $this->bind(\DateTimeInterface::class, static fn() => throw new \RuntimeException('fail!'));
 
-        try {
+        try{
             $this->resolveClosure(
                 static fn(\DateTimeInterface $param) => $param,
             );
             self::fail('Exception should be thrown');
-        } catch (NotFoundException $e) {
+        }catch (NotFoundException $e){
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('fail!', $e->getPrevious()->getMessage());
         }

Braces +5 added lines, -2 removed lines

@@ -103,12 +103,15 @@
     {
         $this->bind(\DateTimeInterface::class, static fn() => throw new \RuntimeException('fail!'));
 
-        try {
+        try
+        {
             $this->resolveClosure(
                 static fn(\DateTimeInterface $param) => $param,
             );
             self::fail('Exception should be thrown');
-        } catch (NotFoundException $e) {
+        }
+        catch (NotFoundException $e)
+        {
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('fail!', $e->getPrevious()->getMessage());
         }

src/Core/tests/InvokerTest.php

Spacing +9 added lines, -9 removed lines

@@ -73,7 +73,7 @@ 
     {
         $this->container->bindSingleton(Bucket::class, $bucket = new Bucket('foo'));
 
-        $result = $this->container->invoke(Storage::class . '::createBucket', ['name' => 'bar']);
+        $result = $this->container->invoke(Storage::class.'::createBucket', ['name' => 'bar']);
 
         self::assertSame($bucket, $result['bucket']);
         self::assertInstanceOf(SampleClass::class, $result['class']);
@@ -142,10 +142,10 @@ 
         // Note: do not add a return type to the closure
         $this->container->bind('foo', fn() => throw new \Exception('Factory called'));
 
-        try {
+        try{
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());
@@ -157,12 +157,12 @@ 
      */
     public function testCallStaticMethodWithoutInstantiationWithOvertypedFactory(): void
     {
-        $this->container->bind('foo', fn(): PrivateConstructor|SampleClass => throw new \Exception('Factory called'));
+        $this->container->bind('foo', fn(): PrivateConstructor | SampleClass => throw new \Exception('Factory called'));
 
-        try {
+        try{
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());
@@ -175,10 +175,10 @@ 
     public function testCallStaticMethodWithoutInstantiationWithNullableTypedFactory(): void
     {
         $this->container->bind('foo', fn(): ?PrivateConstructor => throw new \Exception('Factory called'));
-        try {
+        try{
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());
@@ -190,7 +190,7 @@ 
         $this->expectException(ArgumentResolvingException::class);
         $this->expectExceptionMessage('Unable to resolve required argument `name` when resolving');
 
-        $this->container->invoke(Storage::class . '::createBucket', ['name' => 'bar']);
+        $this->container->invoke(Storage::class.'::createBucket', ['name' => 'bar']);
     }
 
     public function testCallValidClosure(): void

Braces +15 added lines, -6 removed lines

@@ -142,10 +142,13 @@ 
         // Note: do not add a return type to the closure
         $this->container->bind('foo', fn() => throw new \Exception('Factory called'));
 
-        try {
+        try
+        {
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());
@@ -159,10 +162,13 @@ 
     {
         $this->container->bind('foo', fn(): PrivateConstructor|SampleClass => throw new \Exception('Factory called'));
 
-        try {
+        try
+        {
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());
@@ -175,10 +181,13 @@ 
     public function testCallStaticMethodWithoutInstantiationWithNullableTypedFactory(): void
     {
         $this->container->bind('foo', fn(): ?PrivateConstructor => throw new \Exception('Factory called'));
-        try {
+        try
+        {
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());

src/Core/src/Internal/Factory.php

Spacing +8 added lines, -8 removed lines

@@ -37,23 +37,23 @@ 
     public function make(
         string $alias,
         array $parameters = [],
-        \Stringable|string|null $context = null,
+        \Stringable | string | null $context = null,
         ?Tracer $tracer = 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];
         }
 
 
         $this->actor->resolveType($alias, $binding, $singleton, $injector, $actor, false);
-        if ($parameters === [] && $singleton !== null) {
+        if ($parameters === [] && $singleton !== null){
             return $singleton;
         }
 
         $tracer ??= new Tracer();
 
         // Resolve without binding
-        if ($binding === null) {
+        if ($binding === null){
             $tracer->push(
                 false,
                 action: 'autowire',
@@ -61,7 +61,7 @@ 
                 scope: $this->scope->getScopeName(),
                 context: $context,
             );
-            try {
+            try{
                 // No direct instructions how to construct class, make is automatically
                 return $this->actor->autowire(
                     new Ctx(alias: $alias, class: $alias, context: $context, singleton: $parameters === [] ? null : false),
@@ -69,12 +69,12 @@ 
                     $actor,
                     $tracer,
                 );
-            } finally {
+            }finally{
                 $tracer->pop(false);
             }
         }
 
-        try {
+        try{
             $tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -87,7 +87,7 @@ 
 
             $actor->disableBinding($alias);
             return $actor->resolveBinding($binding, $alias, $context, $parameters, $tracer);
-        } finally {
+        }finally{
             $actor->enableBinding($alias, $binding);
             $tracer->pop(true);
             $tracer->pop(false);

Braces +16 added lines, -7 removed lines

@@ -40,20 +40,23 @@ 
         \Stringable|string|null $context = null,
         ?Tracer $tracer = 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];
         }
 
 
         $this->actor->resolveType($alias, $binding, $singleton, $injector, $actor, false);
-        if ($parameters === [] && $singleton !== null) {
+        if ($parameters === [] && $singleton !== null)
+        {
             return $singleton;
         }
 
         $tracer ??= new Tracer();
 
         // Resolve without binding
-        if ($binding === null) {
+        if ($binding === null)
+        {
             $tracer->push(
                 false,
                 action: 'autowire',
@@ -61,7 +64,8 @@ 
                 scope: $this->scope->getScopeName(),
                 context: $context,
             );
-            try {
+            try
+            {
                 // No direct instructions how to construct class, make is automatically
                 return $this->actor->autowire(
                     new Ctx(alias: $alias, class: $alias, context: $context, singleton: $parameters === [] ? null : false),
@@ -69,12 +73,15 @@ 
                     $actor,
                     $tracer,
                 );
-            } finally {
+            }
+            finally
+            {
                 $tracer->pop(false);
             }
         }
 
-        try {
+        try
+        {
             $tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -87,7 +94,9 @@ 
 
             $actor->disableBinding($alias);
             return $actor->resolveBinding($binding, $alias, $context, $parameters, $tracer);
-        } finally {
+        }
+        finally
+        {
             $actor->enableBinding($alias, $binding);
             $tracer->pop(true);
             $tracer->pop(false);

src/Core/src/Internal/Actor.php

Spacing +76 added lines, -76 removed lines

@@ -86,7 +86,7 @@ 
      */
     public function resolveType(
         string $alias,
-        ?Binding &$binding = null,
+        ?Binding & $binding = null,
         ?object &$singleton = null,
         ?object &$injector = null,
         ?self &$actor = null,
@@ -95,20 +95,20 @@ 
         // Aliases to prevent circular dependencies
         $as = [];
         $actor = $this;
-        do {
+        do{
             $bindings = &$actor->state->bindings;
             $singletons = &$actor->state->singletons;
             $injectors = &$actor->state->injectors;
             $binding = $bindings[$alias] ?? null;
-            if (\array_key_exists($alias, $singletons)) {
+            if (\array_key_exists($alias, $singletons)){
                 $singleton = $singletons[$alias];
                 $injector = $injectors[$alias] ?? null;
                 return \is_object($singleton::class) ? $singleton::class : null;
             }
 
-            if ($binding !== null) {
-                if ($followAlias && $binding::class === Alias::class) {
-                    if ($binding->alias === $alias) {
+            if ($binding !== null){
+                if ($followAlias && $binding::class === Alias::class){
+                    if ($binding->alias === $alias){
                         break;
                     }
 
@@ -123,7 +123,7 @@ 
                 return $binding->getReturnClass();
             }
 
-            if (\array_key_exists($alias, $injectors)) {
+            if (\array_key_exists($alias, $injectors)){
                 $injector = $injectors[$alias];
                 $binding = $bindings[$alias] ?? null;
                 return $alias;
@@ -131,12 +131,12 @@ 
 
             // Go to parent scope
             $parent = $actor->scope->getParentActor();
-            if ($parent === null) {
+            if ($parent === null){
                 break;
             }
 
             $actor = $parent;
-        } while (true);
+        }while (true);
 
         return \class_exists($alias) ? $alias : null;
     }
@@ -144,7 +144,7 @@ 
     public function resolveBinding(
         object $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): mixed {
@@ -201,18 +201,18 @@ 
     private function resolveInjector(Config\Injectable $binding, Ctx $ctx, array $arguments, Tracer $tracer)
     {
         $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'.",
@@ -226,7 +226,7 @@ 
             static $cache = [];
             $extended = $cache[$injectorInstance::class] ??= (
             static fn(\ReflectionType $type): bool =>
-                $type::class === \ReflectionUnionType::class || (string) $type === 'mixed'
+                $type::class === \ReflectionUnionType::class || (string)$type === 'mixed'
             )(
                 ($refMethod = new \ReflectionMethod($injectorInstance, 'createInjection'))
                     ->getParameters()[1]->getType()
@@ -236,10 +236,10 @@ 
             $instance = $injectorInstance->createInjection($reflection, match (true) {
                 $asIs => $context,
                 $context instanceof \ReflectionParameter => $context->getName(),
-                default => (string) $context,
+                default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance)){
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -249,12 +249,12 @@ 
             }
 
             return $instance;
-        } catch (TracedContainerException $e) {
+        }catch (TracedContainerException $e){
             throw isset($injectorInstance) ? $e : $e::extendTracedException(\sprintf(
                 'Can\'t resolve `%s`.',
                 $tracer->getRootAlias(),
             ), $tracer->getTraces(), $e);
-        } finally {
+        }finally{
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -262,22 +262,22 @@ 
     private function resolveAlias(
         Config\Alias $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): mixed {
-        if ($binding->alias === $alias) {
+        if ($binding->alias === $alias){
             $instance = $this->autowire(
                 new Ctx(alias: $alias, class: $binding->alias, context: $context, singleton: $binding->singleton && $arguments === []),
                 $arguments,
                 $this,
                 $tracer,
             );
-        } else {
-            try {
+        }else{
+            try{
                 //Binding is pointing to something else
                 $instance = $this->factory->make($binding->alias, $arguments, $context);
-            } catch (TracedContainerException $e) {
+            }catch (TracedContainerException $e){
                 throw $e::extendTracedException(
                     $alias === $tracer->getRootAlias()
                         ? "Can't resolve `{$alias}`."
@@ -294,9 +294,9 @@ 
         return $instance;
     }
 
-    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 === null
                 ? throw new RecursiveProxyException(
                     $alias,
@@ -307,7 +307,7 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getReturnClass()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $result;
         }
 
@@ -317,11 +317,11 @@ 
     private function resolveShared(
         Config\Shared $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): object {
-        if ($arguments !== []) {
+        if ($arguments !== []){
             // Avoid singleton cache
             return $this->createInstance(
                 new Ctx(alias: $alias, class: $binding->value::class, context: $context, singleton: false),
@@ -331,7 +331,7 @@ 
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -341,16 +341,16 @@ 
     private function resolveAutowire(
         Config\Autowire $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): mixed {
         $target = $binding->autowire->alias;
         $ctx = new Ctx(alias: $alias, class: $target, context: $context, singleton: $binding->singleton && $arguments === [] ?: null);
 
-        if ($alias === $target) {
+        if ($alias === $target){
             $instance = $this->autowire($ctx, \array_merge($binding->autowire->parameters, $arguments), $this, $tracer);
-        } else {
+        }else{
             $instance = $binding->autowire->resolve($this->factory, $arguments);
             $this->validateConstraint($instance, $ctx);
         }
@@ -359,30 +359,30 @@ 
     }
 
     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,
         Tracer $tracer,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton && $arguments === [] ?: null);
-        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 TracedContainerException::createWithTrace(
                 \sprintf('Invalid callable binding for `%s`.', $ctx->alias),
                 $tracer->getTraces(),
                 $e,
             );
-        } catch (TracedContainerException $e) {
+        }catch (TracedContainerException $e){
             throw $e::extendTracedException(
                 \sprintf("Can't resolve `%s`: factory invocation failed.", $tracer->getRootAlias()),
                 $tracer->getTraces(),
                 $e,
             );
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw NotFoundException::createWithTrace(
                 \sprintf("Can't resolve `%s`: factory invocation failed.", $tracer->getRootAlias()),
                 $tracer->getTraces(),
@@ -390,7 +390,7 @@ 
             );
         }
 
-        if (\is_object($instance)) {
+        if (\is_object($instance)){
             $this->validateConstraint($instance, $ctx);
             return $this->registerInstance($ctx, $instance);
         }
@@ -401,14 +401,14 @@ 
     private function resolveWeakReference(
         Config\WeakReference $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): ?object {
         $avoidCache = $arguments !== [];
 
-        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)){
+            try{
                 $tracer->push(false, alias: $alias, source: \WeakReference::class, context: $context);
 
                 $object = $this->createInstance(
@@ -417,17 +417,17 @@ 
                     $this,
                     $tracer,
                 );
-                if ($avoidCache) {
+                if ($avoidCache){
                     return $object;
                 }
                 $binding->reference = \WeakReference::create($object);
-            } catch (\Throwable) {
+            }catch (\Throwable){
                 throw ContainerException::createWithTrace(\sprintf(
                     'Can\'t resolve `%s`: can\'t instantiate `%s` from WeakReference binding.',
                     $tracer->getRootAlias(),
                     $alias,
                 ), $tracer->getTraces());
-            } finally {
+            }finally{
                 $tracer->pop();
             }
         }
@@ -443,13 +443,13 @@ 
         object $instance,
         Ctx $ctx,
     ): void {
-        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);
                 }
             }
@@ -476,26 +476,26 @@ 
         Tracer $tracer,
     ): 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 attribute
         $actor = $fallbackActor ?? $this;
-        if ($this->options->checkScope) { # todo
+        if ($this->options->checkScope){ # todo
             $ar = ($reflection->getAttributes(Attribute\Scope::class)[0] ?? null);
-            if ($ar !== null) {
+            if ($ar !== null){
                 /** @var Attribute\Scope $attr */
                 $attr = $ar->newInstance();
                 $scope = $this->scope;
                 $actor = $this;
                 // Go through all parent scopes
                 $needed = $actor;
-                while ($attr->name !== $scope->getScopeName()) {
+                while ($attr->name !== $scope->getScopeName()){
                     $needed = $scope->getParentActor();
-                    if ($needed === null) {
+                    if ($needed === null){
                         throw new BadScopeException($attr->name, $class);
                     }
 
@@ -508,11 +508,11 @@ 
         } # todo
 
         // We have to construct class using external injector when we know the exact context
-        if ($arguments === [] && $actor->binder->hasInjector($class)) {
+        if ($arguments === [] && $actor->binder->hasInjector($class)){
             return $actor->resolveInjector($actor->state->bindings[$ctx->class], $ctx, $arguments, $tracer);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -526,8 +526,8 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null){
+            try{
                 $newScope = $this !== $actor;
                 $debug = [
                     'action' => 'resolve arguments',
@@ -541,39 +541,39 @@ 
                 $tracer->push($newScope, ...$debug);
                 $tracer->push(true);
                 $args = $actor->resolver->resolveArguments($constructor, $arguments, $actor->options->validateArguments);
-            } catch (ValidationException $e) {
+            }catch (ValidationException $e){
                 throw TracedContainerException::createWithTrace(\sprintf(
                     'Can\'t resolve `%s`. %s',
                     $tracer->getRootAlias(),
                     $e->getMessage(),
                 ), $tracer->getTraces());
-            } catch (TracedContainerException $e) {
+            }catch (TracedContainerException $e){
                 throw $e::extendTracedException(\sprintf(
                     'Can\'t resolve `%s`.',
                     $tracer->getRootAlias(),
                 ), $tracer->getTraces(), $e);
-            } finally {
+            }finally{
                 $tracer->pop($newScope);
                 $tracer->pop(false);
             }
-            try {
+            try{
                 // Using constructor with resolved arguments
                 $tracer->push(false, call: "$class::__construct", arguments: $args);
                 $tracer->push(true);
                 $instance = new $class(...$args);
-            } catch (\TypeError $e) {
+            }catch (\TypeError $e){
                 throw new WrongTypeException($constructor, $e);
-            } catch (TracedContainerException $e) {
+            }catch (TracedContainerException $e){
                 throw $e::extendTracedException(\sprintf(
                     'Can\'t resolve `%s`: failed constructing `%s`.',
                     $tracer->getRootAlias(),
                     $class,
                 ), $tracer->getTraces(), $e);
-            } finally {
+            }finally{
                 $tracer->pop(true);
                 $tracer->pop(false);
             }
-        } else {
+        }else{
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -605,12 +605,12 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if (is_bool($ctx->singleton)) {
+        if (is_bool($ctx->singleton)){
             return $ctx->singleton;
         }
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class)){
             return true;
         }
 
@@ -624,7 +624,7 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 
@@ -638,10 +638,10 @@ 
     {
         $scope = $this->scope;
 
-        while ($scope !== null) {
-            foreach ($this->state->inflectors as $class => $inflectors) {
-                if ($instance instanceof $class) {
-                    foreach ($inflectors as $inflector) {
+        while ($scope !== null){
+            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);
@@ -657,9 +657,9 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try{
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
 

Braces +149 added lines, -64 removed lines

@@ -95,20 +95,25 @@ 
         // Aliases to prevent circular dependencies
         $as = [];
         $actor = $this;
-        do {
+        do
+        {
             $bindings = &$actor->state->bindings;
             $singletons = &$actor->state->singletons;
             $injectors = &$actor->state->injectors;
             $binding = $bindings[$alias] ?? null;
-            if (\array_key_exists($alias, $singletons)) {
+            if (\array_key_exists($alias, $singletons))
+            {
                 $singleton = $singletons[$alias];
                 $injector = $injectors[$alias] ?? null;
                 return \is_object($singleton::class) ? $singleton::class : null;
             }
 
-            if ($binding !== null) {
-                if ($followAlias && $binding::class === Alias::class) {
-                    if ($binding->alias === $alias) {
+            if ($binding !== null)
+            {
+                if ($followAlias && $binding::class === Alias::class)
+                {
+                    if ($binding->alias === $alias)
+                    {
                         break;
                     }
 
@@ -123,7 +128,8 @@ 
                 return $binding->getReturnClass();
             }
 
-            if (\array_key_exists($alias, $injectors)) {
+            if (\array_key_exists($alias, $injectors))
+            {
                 $injector = $injectors[$alias];
                 $binding = $bindings[$alias] ?? null;
                 return $alias;
@@ -131,7 +137,8 @@ 
 
             // Go to parent scope
             $parent = $actor->scope->getParentActor();
-            if ($parent === null) {
+            if ($parent === null)
+            {
                 break;
             }
 
@@ -201,18 +208,23 @@ 
     private function resolveInjector(Config\Injectable $binding, Ctx $ctx, array $arguments, Tracer $tracer)
     {
         $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'.",
@@ -239,7 +251,8 @@ 
                 default => (string) $context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -249,12 +262,16 @@ 
             }
 
             return $instance;
-        } catch (TracedContainerException $e) {
+        }
+        catch (TracedContainerException $e)
+        {
             throw isset($injectorInstance) ? $e : $e::extendTracedException(\sprintf(
                 'Can\'t resolve `%s`.',
                 $tracer->getRootAlias(),
             ), $tracer->getTraces(), $e);
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -266,18 +283,24 @@ 
         array $arguments,
         Tracer $tracer,
     ): mixed {
-        if ($binding->alias === $alias) {
+        if ($binding->alias === $alias)
+        {
             $instance = $this->autowire(
                 new Ctx(alias: $alias, class: $binding->alias, context: $context, singleton: $binding->singleton && $arguments === []),
                 $arguments,
                 $this,
                 $tracer,
             );
-        } else {
-            try {
+        }
+        else
+        {
+            try
+            {
                 //Binding is pointing to something else
                 $instance = $this->factory->make($binding->alias, $arguments, $context);
-            } catch (TracedContainerException $e) {
+            }
+            catch (TracedContainerException $e)
+            {
                 throw $e::extendTracedException(
                     $alias === $tracer->getRootAlias()
                         ? "Can't resolve `{$alias}`."
@@ -296,7 +319,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 === null
                 ? throw new RecursiveProxyException(
                     $alias,
@@ -307,7 +331,8 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getReturnClass()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -321,7 +346,8 @@ 
         array $arguments,
         Tracer $tracer,
     ): object {
-        if ($arguments !== []) {
+        if ($arguments !== [])
+        {
             // Avoid singleton cache
             return $this->createInstance(
                 new Ctx(alias: $alias, class: $binding->value::class, context: $context, singleton: false),
@@ -331,7 +357,8 @@ 
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -348,9 +375,12 @@ 
         $target = $binding->autowire->alias;
         $ctx = new Ctx(alias: $alias, class: $target, context: $context, singleton: $binding->singleton && $arguments === [] ?: null);
 
-        if ($alias === $target) {
+        if ($alias === $target)
+        {
             $instance = $this->autowire($ctx, \array_merge($binding->autowire->parameters, $arguments), $this, $tracer);
-        } else {
+        }
+        else
+        {
             $instance = $binding->autowire->resolve($this->factory, $arguments);
             $this->validateConstraint($instance, $ctx);
         }
@@ -366,23 +396,30 @@ 
         Tracer $tracer,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton && $arguments === [] ?: null);
-        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 TracedContainerException::createWithTrace(
                 \sprintf('Invalid callable binding for `%s`.', $ctx->alias),
                 $tracer->getTraces(),
                 $e,
             );
-        } catch (TracedContainerException $e) {
+        }
+        catch (TracedContainerException $e)
+        {
             throw $e::extendTracedException(
                 \sprintf("Can't resolve `%s`: factory invocation failed.", $tracer->getRootAlias()),
                 $tracer->getTraces(),
                 $e,
             );
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw NotFoundException::createWithTrace(
                 \sprintf("Can't resolve `%s`: factory invocation failed.", $tracer->getRootAlias()),
                 $tracer->getTraces(),
@@ -390,7 +427,8 @@ 
             );
         }
 
-        if (\is_object($instance)) {
+        if (\is_object($instance))
+        {
             $this->validateConstraint($instance, $ctx);
             return $this->registerInstance($ctx, $instance);
         }
@@ -407,8 +445,10 @@ 
     ): ?object {
         $avoidCache = $arguments !== [];
 
-        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias))
+        {
+            try
+            {
                 $tracer->push(false, alias: $alias, source: \WeakReference::class, context: $context);
 
                 $object = $this->createInstance(
@@ -417,17 +457,22 @@ 
                     $this,
                     $tracer,
                 );
-                if ($avoidCache) {
+                if ($avoidCache)
+                {
                     return $object;
                 }
                 $binding->reference = \WeakReference::create($object);
-            } catch (\Throwable) {
+            }
+            catch (\Throwable)
+            {
                 throw ContainerException::createWithTrace(\sprintf(
                     'Can\'t resolve `%s`: can\'t instantiate `%s` from WeakReference binding.',
                     $tracer->getRootAlias(),
                     $alias,
                 ), $tracer->getTraces());
-            } finally {
+            }
+            finally
+            {
                 $tracer->pop();
             }
         }
@@ -443,13 +488,16 @@ 
         object $instance,
         Ctx $ctx,
     ): void {
-        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);
                 }
             }
@@ -476,26 +524,34 @@ 
         Tracer $tracer,
     ): 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 attribute
         $actor = $fallbackActor ?? $this;
-        if ($this->options->checkScope) { # todo
+        if ($this->options->checkScope)
+        {
+# todo
             $ar = ($reflection->getAttributes(Attribute\Scope::class)[0] ?? null);
-            if ($ar !== null) {
+            if ($ar !== null)
+            {
                 /** @var Attribute\Scope $attr */
                 $attr = $ar->newInstance();
                 $scope = $this->scope;
                 $actor = $this;
                 // Go through all parent scopes
                 $needed = $actor;
-                while ($attr->name !== $scope->getScopeName()) {
+                while ($attr->name !== $scope->getScopeName())
+                {
                     $needed = $scope->getParentActor();
-                    if ($needed === null) {
+                    if ($needed === null)
+                    {
                         throw new BadScopeException($attr->name, $class);
                     }
 
@@ -508,11 +564,13 @@ 
         } # todo
 
         // We have to construct class using external injector when we know the exact context
-        if ($arguments === [] && $actor->binder->hasInjector($class)) {
+        if ($arguments === [] && $actor->binder->hasInjector($class))
+        {
             return $actor->resolveInjector($actor->state->bindings[$ctx->class], $ctx, $arguments, $tracer);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -526,8 +584,10 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 $newScope = $this !== $actor;
                 $debug = [
                     'action' => 'resolve arguments',
@@ -541,39 +601,54 @@ 
                 $tracer->push($newScope, ...$debug);
                 $tracer->push(true);
                 $args = $actor->resolver->resolveArguments($constructor, $arguments, $actor->options->validateArguments);
-            } catch (ValidationException $e) {
+            }
+            catch (ValidationException $e)
+            {
                 throw TracedContainerException::createWithTrace(\sprintf(
                     'Can\'t resolve `%s`. %s',
                     $tracer->getRootAlias(),
                     $e->getMessage(),
                 ), $tracer->getTraces());
-            } catch (TracedContainerException $e) {
+            }
+            catch (TracedContainerException $e)
+            {
                 throw $e::extendTracedException(\sprintf(
                     'Can\'t resolve `%s`.',
                     $tracer->getRootAlias(),
                 ), $tracer->getTraces(), $e);
-            } finally {
+            }
+            finally
+            {
                 $tracer->pop($newScope);
                 $tracer->pop(false);
             }
-            try {
+            try
+            {
                 // Using constructor with resolved arguments
                 $tracer->push(false, call: "$class::__construct", arguments: $args);
                 $tracer->push(true);
                 $instance = new $class(...$args);
-            } catch (\TypeError $e) {
+            }
+            catch (\TypeError $e)
+            {
                 throw new WrongTypeException($constructor, $e);
-            } catch (TracedContainerException $e) {
+            }
+            catch (TracedContainerException $e)
+            {
                 throw $e::extendTracedException(\sprintf(
                     'Can\'t resolve `%s`: failed constructing `%s`.',
                     $tracer->getRootAlias(),
                     $class,
                 ), $tracer->getTraces(), $e);
-            } finally {
+            }
+            finally
+            {
                 $tracer->pop(true);
                 $tracer->pop(false);
             }
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -605,12 +680,14 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if (is_bool($ctx->singleton)) {
+        if (is_bool($ctx->singleton))
+        {
             return $ctx->singleton;
         }
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class))
+        {
             return true;
         }
 
@@ -624,7 +701,8 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -638,10 +716,14 @@ 
     {
         $scope = $this->scope;
 
-        while ($scope !== null) {
-            foreach ($this->state->inflectors as $class => $inflectors) {
-                if ($instance instanceof $class) {
-                    foreach ($inflectors as $inflector) {
+        while ($scope !== null)
+        {
+            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);
@@ -657,9 +739,12 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try
+        {
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             return false;
         }