spiral / framework

src/Core/tests/ExceptionsTest.php

Spacing +6 added lines, -6 removed lines

@@ -208,10 +208,10 @@ 
                 context: Parameter #1 [ <required> Spiral\Tests\Core\Fixtures\InvalidClass $class ]
             MARKDOWN;
 
-        try {
+        try{
             $container->get(InvalidWithContainerInside::class);
             self::fail('Exception `ContainerException` expected');
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             self::assertSame($expectedMessage, $e->getMessage());
         }
     }
@@ -234,9 +234,9 @@ 
     {
         $container = new Container();
 
-        try {
+        try{
             $container->get('invalid');
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             self::assertSame(<<<MARKDOWN
                 Can't autowire `invalid`: class or injector not found.
                 Resolving trace:
@@ -267,9 +267,9 @@ 
     {
         $this->expectException(ContainerException::class);
 
-        try {
+        try{
             $container->get(ClassWithUndefinedDependency::class);
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             self::assertSame($message, $e->getMessage());
 
             throw $e;

Braces +15 added lines, -6 removed lines

@@ -208,10 +208,13 @@ 
                 context: Parameter #1 [ <required> Spiral\Tests\Core\Fixtures\InvalidClass $class ]
             MARKDOWN;
 
-        try {
+        try
+        {
             $container->get(InvalidWithContainerInside::class);
             self::fail('Exception `ContainerException` expected');
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             self::assertSame($expectedMessage, $e->getMessage());
         }
     }
@@ -234,9 +237,12 @@ 
     {
         $container = new Container();
 
-        try {
+        try
+        {
             $container->get('invalid');
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             self::assertSame(<<<MARKDOWN
                 Can't autowire `invalid`: class or injector not found.
                 Resolving trace:
@@ -267,9 +273,12 @@ 
     {
         $this->expectException(ContainerException::class);
 
-        try {
+        try
+        {
             $container->get(ClassWithUndefinedDependency::class);
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             self::assertSame($message, $e->getMessage());
 
             throw $e;

src/Core/tests/Scope/ScopeAttributeTest.php

Spacing +5 added lines, -5 removed lines

@@ -166,7 +166,7 @@ 
 
         $root = self::makeContainer();
 
-        try {
+        try{
             $root->runScoped(static function (Container $c1): void {
                 $c1->runScoped(static function (Container $c2): void {
                     $c2->runScoped(static function (Container $c3): void {
@@ -174,7 +174,7 @@ 
                     }, name: 'root');
                 });
             });
-        } catch (NamedScopeDuplicationException $e) {
+        }catch (NamedScopeDuplicationException $e){
             self::assertSame('root', $e->getScope());
             throw $e;
         }
@@ -187,7 +187,7 @@ 
     #[Group('scrutinizer-ignore')]
     public function testBadScopeException(): void
     {
-        try {
+        try{
             $root = self::makeContainer();
             $root->runScoped(static function (Container $c1): void {
                 $c1->runScoped(static function (Container $c2): void {
@@ -195,8 +195,8 @@ 
                 });
             }, name: 'bar');
 
-            self::fail(BadScopeException::class . ' should be thrown');
-        } catch (BadScopeException $e) {
+            self::fail(BadScopeException::class.' should be thrown');
+        }catch (BadScopeException $e){
             self::assertSame('foo', $e->getScope());
         }
     }

Braces +10 added lines, -4 removed lines

@@ -166,7 +166,8 @@ 
 
         $root = self::makeContainer();
 
-        try {
+        try
+        {
             $root->runScoped(static function (Container $c1): void {
                 $c1->runScoped(static function (Container $c2): void {
                     $c2->runScoped(static function (Container $c3): void {
@@ -174,7 +175,9 @@ 
                     }, name: 'root');
                 });
             });
-        } catch (NamedScopeDuplicationException $e) {
+        }
+        catch (NamedScopeDuplicationException $e)
+        {
             self::assertSame('root', $e->getScope());
             throw $e;
         }
@@ -187,7 +190,8 @@ 
     #[Group('scrutinizer-ignore')]
     public function testBadScopeException(): void
     {
-        try {
+        try
+        {
             $root = self::makeContainer();
             $root->runScoped(static function (Container $c1): void {
                 $c1->runScoped(static function (Container $c2): void {
@@ -196,7 +200,9 @@ 
             }, name: 'bar');
 
             self::fail(BadScopeException::class . ' should be thrown');
-        } catch (BadScopeException $e) {
+        }
+        catch (BadScopeException $e)
+        {
             self::assertSame('foo', $e->getScope());
         }
     }

src/Core/tests/Fixtures/PrivateConstructor.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 final class PrivateConstructor
 {
-    private function __construct() {}
+    private function __construct(){}
 
     private static function privateMethod(int $result): int
     {

Braces +3 added lines, -1 removed lines

@@ -6,7 +6,9 @@
 
 final class PrivateConstructor
 {
-    private function __construct() {}
+    private function __construct()
+    {
+}
 
     private static function privateMethod(int $result): int
     {

src/Core/tests/InvokerTest.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,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']);
@@ -149,7 +149,7 @@ 
      */
     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'));
         $this->expectExceptionMessage('Factory called');
         $this->container->invoke(['foo', 'publicMethod'], [42]);
     }
@@ -169,7 +169,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

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 @@ 
 
             // unset($this->state->bindings[$alias]);
             return $actor->resolveBinding($binding, $alias, $context, $parameters, $tracer);
-        } finally {
+        }finally{
             // $this->state->bindings[$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 @@ 
 
             // unset($this->state->bindings[$alias]);
             return $actor->resolveBinding($binding, $alias, $context, $parameters, $tracer);
-        } finally {
+        }
+        finally
+        {
             // $this->state->bindings[$alias] ??= $binding;
             $tracer->pop(true);
             $tracer->pop(false);

src/Core/src/Internal/Scope.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 
     public function __construct(
         private readonly ?string $scopeName = null,
-    ) {}
+    ){}
 
     public function getScopeName(): ?string
     {
@@ -39,9 +39,9 @@ 
         $this->parentActor = $actor;
 
         // Check a scope with the same name is not already registered
-        if ($this->scopeName !== null) {
+        if ($this->scopeName !== null){
             $tmp = $this;
-            while ($tmp->parentScope !== null) {
+            while ($tmp->parentScope !== null){
                 $tmp = $tmp->parentScope;
                 $tmp->scopeName !== $this->scopeName ?: throw new NamedScopeDuplicationException($this->scopeName);
             }
@@ -64,7 +64,7 @@ 
         $result = [$this->scopeName];
 
         $parent = $this;
-        while ($parent->parentScope !== null) {
+        while ($parent->parentScope !== null){
             $parent = $parent->parentScope;
             $result[] = $parent->scopeName;
         }

Braces +8 added lines, -4 removed lines

@@ -17,7 +17,8 @@ 
 
     public function __construct(
         private readonly ?string $scopeName = null,
-    ) {}
+    ) {
+}
 
     public function getScopeName(): ?string
     {
@@ -39,9 +40,11 @@ 
         $this->parentActor = $actor;
 
         // Check a scope with the same name is not already registered
-        if ($this->scopeName !== null) {
+        if ($this->scopeName !== null)
+        {
             $tmp = $this;
-            while ($tmp->parentScope !== null) {
+            while ($tmp->parentScope !== null)
+            {
                 $tmp = $tmp->parentScope;
                 $tmp->scopeName !== $this->scopeName ?: throw new NamedScopeDuplicationException($this->scopeName);
             }
@@ -64,7 +67,8 @@ 
         $result = [$this->scopeName];
 
         $parent = $this;
-        while ($parent->parentScope !== null) {
+        while ($parent->parentScope !== null)
+        {
             $parent = $parent->parentScope;
             $result[] = $parent->scopeName;
         }

src/Core/src/Internal/Invoker.php

Spacing +10 added lines, -10 removed lines

@@ -42,26 +42,26 @@ 
      */
     public function invoke(mixed $target, array $parameters = []): mixed
     {
-        if (\is_array($target) && isset($target[1])) {
+        if (\is_array($target) && isset($target[1])){
             // In a form of resolver and method
             [$resolver, $method] = $target;
 
             // Resolver instance or class name if the method is static (i.e. [ClassName::class, 'method'])
-            if (\is_string($resolver)) {
+            if (\is_string($resolver)){
                 // Detect return type
                 $type = $this->actor->resolveType($resolver, $binding, $singleton, $injector);
 
-                if ($singleton === null) {
+                if ($singleton === null){
                     $type ??= $injector === null && $binding === null ? $resolver : null;
                     $resolver = \is_callable([$type, $method]) ? $type : $this->container->get($resolver);
-                } else {
+                }else{
                     $resolver = $singleton;
                 }
             }
 
-            try {
+            try{
                 $method = new \ReflectionMethod($resolver, $method);
-            } catch (\ReflectionException $e) {
+            }catch (\ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -72,14 +72,14 @@ 
             );
         }
 
-        if (\is_string($target) && \is_callable($target)) {
+        if (\is_string($target) && \is_callable($target)){
             $target = $target(...);
         }
 
-        if ($target instanceof \Closure) {
-            try {
+        if ($target instanceof \Closure){
+            try{
                 $reflection = new \ReflectionFunction($target);
-            } catch (\ReflectionException $e) {
+            }catch (\ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 

Braces +23 added lines, -10 removed lines

@@ -42,26 +42,34 @@ 
      */
     public function invoke(mixed $target, array $parameters = []): mixed
     {
-        if (\is_array($target) && isset($target[1])) {
+        if (\is_array($target) && isset($target[1]))
+        {
             // In a form of resolver and method
             [$resolver, $method] = $target;
 
             // Resolver instance or class name if the method is static (i.e. [ClassName::class, 'method'])
-            if (\is_string($resolver)) {
+            if (\is_string($resolver))
+            {
                 // Detect return type
                 $type = $this->actor->resolveType($resolver, $binding, $singleton, $injector);
 
-                if ($singleton === null) {
+                if ($singleton === null)
+                {
                     $type ??= $injector === null && $binding === null ? $resolver : null;
                     $resolver = \is_callable([$type, $method]) ? $type : $this->container->get($resolver);
-                } else {
+                }
+                else
+                {
                     $resolver = $singleton;
                 }
             }
 
-            try {
+            try
+            {
                 $method = new \ReflectionMethod($resolver, $method);
-            } catch (\ReflectionException $e) {
+            }
+            catch (\ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -72,14 +80,19 @@ 
             );
         }
 
-        if (\is_string($target) && \is_callable($target)) {
+        if (\is_string($target) && \is_callable($target))
+        {
             $target = $target(...);
         }
 
-        if ($target instanceof \Closure) {
-            try {
+        if ($target instanceof \Closure)
+        {
+            try
+            {
                 $reflection = new \ReflectionFunction($target);
-            } catch (\ReflectionException $e) {
+            }
+            catch (\ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 

src/Core/src/Internal/Actor.php

Spacing +75 added lines, -75 removed lines

@@ -76,7 +76,7 @@ 
      */
     public function resolveType(
         string $alias,
-        ?Binding &$binding = null,
+        ?Binding & $binding = null,
         ?object &$singleton = null,
         ?object &$injector = null,
         ?self &$actor = null,
@@ -85,21 +85,21 @@ 
         // Aliases to prevent circular dependencies
         $as = [];
         $actor = $this;
-        do {
+        do{
             $bindings = &$actor->state->bindings;
             $singletons = &$actor->state->singletons;
             $injectors = &$actor->state->injectors;
-            if (\array_key_exists($alias, $singletons)) {
+            if (\array_key_exists($alias, $singletons)){
                 $singleton = $singletons[$alias];
                 $binding = $bindings[$alias] ?? null;
                 $injector = $injectors[$alias] ?? null;
                 return \is_object($singleton::class) ? $singleton::class : null;
             }
 
-            if (\array_key_exists($alias, $bindings)) {
+            if (\array_key_exists($alias, $bindings)){
                 $binding = $bindings[$alias];
-                if ($followAlias && $binding::class === Alias::class) {
-                    if ($binding->alias === $alias) {
+                if ($followAlias && $binding::class === Alias::class){
+                    if ($binding->alias === $alias){
                         break;
                     }
 
@@ -114,7 +114,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;
@@ -122,12 +122,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;
     }
@@ -135,7 +135,7 @@ 
     public function resolveBinding(
         object $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): mixed {
@@ -192,18 +192,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'.",
@@ -217,7 +217,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()
@@ -227,10 +227,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'.",
@@ -240,12 +240,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;
         }
     }
@@ -253,22 +253,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}`."
@@ -285,9 +285,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,
@@ -298,7 +298,7 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getReturnClass()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $result;
         }
 
@@ -308,11 +308,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),
@@ -322,7 +322,7 @@ 
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -332,16 +332,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);
         }
@@ -350,24 +350,24 @@ 
     }
 
     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(),
@@ -375,7 +375,7 @@ 
             );
         }
 
-        if (\is_object($instance)) {
+        if (\is_object($instance)){
             $this->validateConstraint($instance, $ctx);
             return $this->registerInstance($ctx, $instance);
         }
@@ -386,14 +386,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(
@@ -402,17 +402,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();
             }
         }
@@ -428,13 +428,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);
                 }
             }
@@ -461,26 +461,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);
                     }
 
@@ -493,11 +493,11 @@ 
         } # todo
 
         // 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 $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',
@@ -511,8 +511,8 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null){
+            try{
                 $newScope = $this !== $actor;
                 $debug = [
                     'action' => 'resolve arguments',
@@ -526,39 +526,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();
         }
@@ -590,12 +590,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;
         }
 
@@ -609,7 +609,7 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 
@@ -623,10 +623,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);
@@ -642,9 +642,9 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try{
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
 

Braces +146 added lines, -63 removed lines

@@ -85,21 +85,26 @@ 
         // Aliases to prevent circular dependencies
         $as = [];
         $actor = $this;
-        do {
+        do
+        {
             $bindings = &$actor->state->bindings;
             $singletons = &$actor->state->singletons;
             $injectors = &$actor->state->injectors;
-            if (\array_key_exists($alias, $singletons)) {
+            if (\array_key_exists($alias, $singletons))
+            {
                 $singleton = $singletons[$alias];
                 $binding = $bindings[$alias] ?? null;
                 $injector = $injectors[$alias] ?? null;
                 return \is_object($singleton::class) ? $singleton::class : null;
             }
 
-            if (\array_key_exists($alias, $bindings)) {
+            if (\array_key_exists($alias, $bindings))
+            {
                 $binding = $bindings[$alias];
-                if ($followAlias && $binding::class === Alias::class) {
-                    if ($binding->alias === $alias) {
+                if ($followAlias && $binding::class === Alias::class)
+                {
+                    if ($binding->alias === $alias)
+                    {
                         break;
                     }
 
@@ -114,7 +119,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;
@@ -122,7 +128,8 @@ 
 
             // Go to parent scope
             $parent = $actor->scope->getParentActor();
-            if ($parent === null) {
+            if ($parent === null)
+            {
                 break;
             }
 
@@ -192,18 +199,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'.",
@@ -230,7 +242,8 @@ 
                 default => (string) $context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -240,12 +253,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;
         }
     }
@@ -257,18 +274,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}`."
@@ -287,7 +310,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,
@@ -298,7 +322,8 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getReturnClass()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -312,7 +337,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),
@@ -322,7 +348,8 @@ 
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -339,9 +366,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);
         }
@@ -357,17 +387,22 @@ 
         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(),
@@ -375,7 +410,8 @@ 
             );
         }
 
-        if (\is_object($instance)) {
+        if (\is_object($instance))
+        {
             $this->validateConstraint($instance, $ctx);
             return $this->registerInstance($ctx, $instance);
         }
@@ -392,8 +428,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(
@@ -402,17 +440,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();
             }
         }
@@ -428,13 +471,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);
                 }
             }
@@ -461,26 +507,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);
                     }
 
@@ -493,11 +547,13 @@ 
         } # todo
 
         // 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 $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',
@@ -511,8 +567,10 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 $newScope = $this !== $actor;
                 $debug = [
                     'action' => 'resolve arguments',
@@ -526,39 +584,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();
         }
@@ -590,12 +663,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;
         }
 
@@ -609,7 +684,8 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -623,10 +699,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);
@@ -642,9 +722,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/Tracer.php

Spacing +8 added lines, -8 removed lines

@@ -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 === null ? [] : [$trace];
-        } elseif ($trace !== null) {
+        } elseif ($trace !== null){
             $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;
         }
@@ -62,7 +62,7 @@ 
 
     public function __toString(): string
     {
-        return $this->traces === [] ? '' : "Resolving trace:\n" . self::renderTraceList($this->traces);
+        return $this->traces === [] ? '' : "Resolving trace:\n".self::renderTraceList($this->traces);
     }
 
     /**
@@ -72,7 +72,7 @@ 
     {
         $result = [];
         $i = 0;
-        foreach ($blocks as $block) {
+        foreach ($blocks as $block){
             \array_push($result, ...self::blockToStringList($block, $i++));
         }
         return \implode("\n", $result);
@@ -92,8 +92,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 === null ? [] : [$trace];
-        } elseif ($trace !== null) {
+        }
+        elseif ($trace !== null)
+        {
             $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;
         }
@@ -72,7 +77,8 @@ 
     {
         $result = [];
         $i = 0;
-        foreach ($blocks as $block) {
+        foreach ($blocks as $block)
+        {
             \array_push($result, ...self::blockToStringList($block, $i++));
         }
         return \implode("\n", $result);
@@ -92,7 +98,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;