spiral / framework

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

Spacing +25 added lines, -25 removed lines

@@ -27,29 +27,29 @@ 
             MagicCallTrait::class,
         ] : [];
 
-        if (\str_contains($className, '\\')) {
+        if (\str_contains($className, '\\')){
             $classShortName = \substr($className, \strrpos($className, '\\') + 1);
-            $classNamespaceStr = 'namespace ' . \substr($className, 0, \strrpos($className, '\\')) . ';';
-        } else {
+            $classNamespaceStr = 'namespace '.\substr($className, 0, \strrpos($className, '\\')).';';
+        }else{
             $classShortName = $className;
             $classNamespaceStr = '';
         }
 
         $interface = $type->getName();
         $classBody = [];
-        foreach ($type->getMethods() as $method) {
-            if ($method->isConstructor()) {
+        foreach ($type->getMethods() as $method){
+            if ($method->isConstructor()){
                 throw new \LogicException('Constructor is not allowed in a proxy.');
             }
 
-            if ($method->isDestructor()) {
+            if ($method->isDestructor()){
                 $classBody[] = self::renderMethod($method);
                 continue;
             }
 
             $hasRefs = false;
-            $return = $method->hasReturnType() && (string) $method->getReturnType() === 'void' ? '' : 'return ';
-            $call = ($method->isStatic() ? '::' : '->') . $method->getName();
+            $return = $method->hasReturnType() && (string)$method->getReturnType() === 'void' ? '' : 'return ';
+            $call = ($method->isStatic() ? '::' : '->').$method->getName();
             $context = $method->isStatic() ? 'null' : '$this->__container_proxy_context';
             $containerStr = match (false) {
                 $attachContainer => 'null',
@@ -69,12 +69,12 @@ 
                 PHP;
 
             $args = [];
-            foreach ($method->getParameters() as $param) {
+            foreach ($method->getParameters() as $param){
                 $hasRefs = $hasRefs || $param->isPassedByReference();
-                $args[] = ($param->isVariadic() ? '...' : '') . '$' . $param->getName();
+                $args[] = ($param->isVariadic() ? '...' : '').'$'.$param->getName();
             }
 
-            if (!$hasRefs && !$method->isVariadic()) {
+            if (!$hasRefs && !$method->isVariadic()){
                 $classBody[] = self::renderMethod(
                     $method,
                     <<<PHP
@@ -86,7 +86,7 @@ 
 
             $argsStr = \implode(', ', $args);
 
-            if ($method->isVariadic()) {
+            if ($method->isVariadic()){
                 $classBody[] = self::renderMethod(
                     $method,
                     <<<PHP
@@ -108,7 +108,7 @@ 
 
         $traitsStr = $traits === [] ? '' : \implode(
             "\n    ",
-            \array_map(static fn(string $trait): string => 'use \\' . \ltrim($trait, '\\') . ';', $traits),
+            \array_map(static fn(string $trait) : string => 'use \\'.\ltrim($trait, '\\').';', $traits),
         );
         return <<<PHP
             $classNamespaceStr
@@ -131,7 +131,7 @@ 
             $m->getName(),
             \implode(', ', \array_map(self::renderParameter(...), $m->getParameters())),
             $m->hasReturnType()
-                ? ': ' . self::renderParameterTypes($m->getReturnType(), $m->getDeclaringClass())
+                ? ': '.self::renderParameterTypes($m->getReturnType(), $m->getDeclaringClass())
                 : '',
             $body,
         );
@@ -145,8 +145,8 @@ 
                 $param->hasType() ? 'mixed' : '',
                 $param->isPassedByReference() ? '&' : '',
                 $param->isVariadic() ? '...' : '',
-                '$' . $param->getName(),
-                $param->isOptional() && !$param->isVariadic() ? ' = ' . self::renderDefaultValue($param) : '',
+                '$'.$param->getName(),
+                $param->isOptional() && !$param->isVariadic() ? ' = '.self::renderDefaultValue($param) : '',
             ),
             ' ',
         );
@@ -154,8 +154,8 @@ 
 
     public static function renderParameterTypes(\ReflectionType $types, \ReflectionClass $class): string
     {
-        if ($types instanceof \ReflectionNamedType) {
-            return ($types->allowsNull() && $types->getName() !== 'mixed' ? '?' : '') . ($types->isBuiltin()
+        if ($types instanceof \ReflectionNamedType){
+            return ($types->allowsNull() && $types->getName() !== 'mixed' ? '?' : '').($types->isBuiltin()
                     ? $types->getName()
                     : self::normalizeClassType($types, $class));
         }
@@ -167,7 +167,7 @@ 
         };
 
         $result = [];
-        foreach ($types as $type) {
+        foreach ($types as $type){
             $result[] = $type->isBuiltin()
                 ? $type->getName()
                 : self::normalizeClassType($type, $class);
@@ -178,12 +178,12 @@ 
 
     public static function renderDefaultValue(\ReflectionParameter $param): string
     {
-        if ($param->isDefaultValueConstant()) {
+        if ($param->isDefaultValueConstant()){
             $result = $param->getDefaultValueConstantName();
 
-            return \explode('::', (string) $result)[0] === 'self'
+            return \explode('::', (string)$result)[0] === 'self'
                 ? $result
-                : '\\' . $result;
+                : '\\'.$result;
         }
 
         $cut = self::cutDefaultValue($param);
@@ -197,14 +197,14 @@ 
     {
         return match($type->getName()) {
             'static' => 'static',
-            'self' => '\\' . $class->getName(),
-            default => '\\' . $type->getName(),
+            'self' => '\\'.$class->getName(),
+            default => '\\'.$type->getName(),
         };
     }
 
     private static function cutDefaultValue(\ReflectionParameter $param): string
     {
-        $string = (string) $param;
+        $string = (string)$param;
 
         return \trim(\substr($string, \strpos($string, '=') + 1, -1));
     }

src/Core/src/Internal/Actor.php

Spacing +78 added lines, -78 removed lines

@@ -87,7 +87,7 @@ 
      */
     public function resolveType(
         string $alias,
-        ?Binding &$binding = null,
+        ?Binding & $binding = null,
         ?object &$singleton = null,
         ?object &$injector = null,
         ?self &$actor = null,
@@ -96,20 +96,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;
                     }
 
@@ -124,7 +124,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;
@@ -132,12 +132,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;
     }
@@ -145,7 +145,7 @@ 
     public function resolveBinding(
         object $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): mixed {
@@ -202,18 +202,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'.",
@@ -227,7 +227,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()
@@ -237,10 +237,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'.",
@@ -250,12 +250,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;
         }
     }
@@ -263,22 +263,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}`."
@@ -295,9 +295,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,
@@ -308,7 +308,7 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getReturnClass()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $result;
         }
 
@@ -318,11 +318,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),
@@ -332,7 +332,7 @@ 
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -342,16 +342,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);
         }
@@ -360,32 +360,32 @@ 
     }
 
     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 (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw $e;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw NotFoundException::createWithTrace(
                 \sprintf("Can't resolve `%s` due to factory invocation error: %s", $tracer->getRootAlias(), $e->getMessage()),
                 $tracer->getTraces(),
@@ -393,7 +393,7 @@ 
             );
         }
 
-        if (\is_object($instance)) {
+        if (\is_object($instance)){
             $this->validateConstraint($instance, $ctx);
             return $this->registerInstance($ctx, $instance);
         }
@@ -404,14 +404,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(
@@ -420,17 +420,17 @@ 
                     $this,
                     $tracer,
                 );
-                if ($avoidCache) {
+                if ($avoidCache){
                     return $object;
                 }
                 $binding->reference = \WeakReference::create($object);
-            } catch (\Throwable) {
+            }catch (\Throwable){
                 throw TracedContainerException::createWithTrace(\sprintf(
                     'Can\'t resolve `%s`: can\'t instantiate `%s` from WeakReference binding.',
                     $tracer->getRootAlias(),
                     $alias,
                 ), $tracer->getTraces());
-            } finally {
+            }finally{
                 $tracer->pop();
             }
         }
@@ -446,13 +446,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);
                 }
             }
@@ -479,26 +479,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);
                     }
 
@@ -511,11 +511,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',
@@ -529,8 +529,8 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null){
+            try{
                 $newScope = $this !== $actor;
                 $debug = [
                     'action' => 'resolve arguments',
@@ -544,18 +544,18 @@ 
                 $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);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 throw TracedContainerException::createWithTrace(
                     \sprintf(
                         "Can't resolve `%s`.\n%s",
@@ -563,28 +563,28 @@ 
                         $e->getMessage(),
                     ), $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();
         }
@@ -616,12 +616,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;
         }
 
@@ -635,7 +635,7 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 
@@ -649,10 +649,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);
@@ -668,9 +668,9 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try{
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
 

Braces +155 added lines, -66 removed lines

@@ -96,20 +96,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;
                     }
 
@@ -124,7 +129,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;
@@ -132,7 +138,8 @@ 
 
             // Go to parent scope
             $parent = $actor->scope->getParentActor();
-            if ($parent === null) {
+            if ($parent === null)
+            {
                 break;
             }
 
@@ -202,18 +209,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'.",
@@ -240,7 +252,8 @@ 
                 default => (string) $context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -250,12 +263,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;
         }
     }
@@ -267,18 +284,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}`."
@@ -297,7 +320,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,
@@ -308,7 +332,8 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getReturnClass()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -322,7 +347,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),
@@ -332,7 +358,8 @@ 
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -349,9 +376,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);
         }
@@ -367,25 +397,34 @@ 
         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 (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw $e;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw NotFoundException::createWithTrace(
                 \sprintf("Can't resolve `%s` due to factory invocation error: %s", $tracer->getRootAlias(), $e->getMessage()),
                 $tracer->getTraces(),
@@ -393,7 +432,8 @@ 
             );
         }
 
-        if (\is_object($instance)) {
+        if (\is_object($instance))
+        {
             $this->validateConstraint($instance, $ctx);
             return $this->registerInstance($ctx, $instance);
         }
@@ -410,8 +450,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(
@@ -420,17 +462,22 @@ 
                     $this,
                     $tracer,
                 );
-                if ($avoidCache) {
+                if ($avoidCache)
+                {
                     return $object;
                 }
                 $binding->reference = \WeakReference::create($object);
-            } catch (\Throwable) {
+            }
+            catch (\Throwable)
+            {
                 throw TracedContainerException::createWithTrace(\sprintf(
                     'Can\'t resolve `%s`: can\'t instantiate `%s` from WeakReference binding.',
                     $tracer->getRootAlias(),
                     $alias,
                 ), $tracer->getTraces());
-            } finally {
+            }
+            finally
+            {
                 $tracer->pop();
             }
         }
@@ -446,13 +493,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);
                 }
             }
@@ -479,26 +529,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);
                     }
 
@@ -511,11 +569,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',
@@ -529,8 +589,10 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 $newScope = $this !== $actor;
                 $debug = [
                     'action' => 'resolve arguments',
@@ -544,18 +606,24 @@ 
                 $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);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 throw TracedContainerException::createWithTrace(
                     \sprintf(
                         "Can't resolve `%s`.\n%s",
@@ -563,28 +631,39 @@ 
                         $e->getMessage(),
                     ), $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();
         }
@@ -616,12 +695,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;
         }
 
@@ -635,7 +716,8 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -649,10 +731,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);
@@ -668,9 +754,12 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try
+        {
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             return false;
         }