spiral / framework

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

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
         $this->expectExceptionMessage('Enum `Spiral\Tests\Core\Stub\EnumObject` can not be constructed.');
 
         $this->resolveClosure(
-            static function (EnumObject $enum) {},
+            static function (EnumObject $enum){},
         );
     }
 
@@ -75,7 +75,7 @@ 
         );
 
         $this->resolveClosure(
-            static function (TestTrait $enum) {},
+            static function (TestTrait $enum){},
         );
     }
 }

Braces +6 added lines, -2 removed lines

@@ -63,7 +63,9 @@ 
         $this->expectExceptionMessage('Enum `Spiral\Tests\Core\Stub\EnumObject` can not be constructed.');
 
         $this->resolveClosure(
-            static function (EnumObject $enum) {},
+            static function (EnumObject $enum)
+            {
+},
         );
     }
 
@@ -75,7 +77,9 @@ 
         );
 
         $this->resolveClosure(
-            static function (TestTrait $enum) {},
+            static function (TestTrait $enum)
+            {
+},
         );
     }
 }

src/Core/src/Config.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         public readonly string $binder = Binder::class,
         public readonly string $invoker = Invoker::class,
         public readonly string $tracer = Tracer::class,
-    ) {
+    ){
     }
 
     public function getIterator(): Traversable

src/Core/src/Exception/Resolver/InvalidArgumentException.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     public function __construct(
         \ReflectionFunctionAbstract $reflection,
         private readonly string $parameter
-    ) {
+    ){
         $pattern = "Invalid argument value type for the `$parameter` parameter when validating arguments for `%s`.";
         parent::__construct($this->renderFunctionAndParameter($reflection, $pattern));
     }

src/Core/tests/ExceptionsTest.php

Spacing +2 added lines, -2 removed lines

@@ -131,9 +131,9 @@
     {
         $container = new Container();
 
-        try {
+        try{
             $container->get('invalid');
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             $this->assertSame(
                 <<<MARKDOWN
                 Can't resolve `invalid`: undefined class or binding `invalid`.

Braces +5 added lines, -2 removed lines

@@ -131,9 +131,12 @@
     {
         $container = new Container();
 
-        try {
+        try
+        {
             $container->get('invalid');
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             $this->assertSame(
                 <<<MARKDOWN
                 Can't resolve `invalid`: undefined class or binding `invalid`.

src/Core/src/Internal/Trace.php

Braces +8 added lines, -4 removed lines

@@ -27,7 +27,8 @@ 
     public function __toString(): string
     {
         $info = [];
-        foreach ($this->info as $key => $item) {
+        foreach ($this->info as $key => $item)
+        {
             $info[] = "$key: {$this->stringifyValue($item)}";
         }
         return \implode("\n", $info);
@@ -47,14 +48,17 @@ 
 
     private function renderArray(array $array, int $level = 0): string
     {
-        if ($array === []) {
+        if ($array === [])
+        {
             return '[]';
         }
-        if ($level >= self::ARRAY_MAX_LEVEL) {
+        if ($level >= self::ARRAY_MAX_LEVEL)
+        {
             return 'array';
         }
         $result = [];
-        foreach ($array as $key => $value) {
+        foreach ($array as $key => $value)
+        {
             $result[] = \sprintf(
                 '%s: %s',
                 $key,

Spacing +8 added lines, -8 removed lines

@@ -19,14 +19,14 @@ 
 
     public function __construct(
         public array $info = [],
-    ) {
+    ){
         $this->alias = $info['alias'] ?? null;
     }
 
     public function __toString(): string
     {
         $info = [];
-        foreach ($this->info as $key => $item) {
+        foreach ($this->info as $key => $item){
             $info[] = "$key: {$this->stringifyValue($item)}";
         }
         return \implode("\n", $info);
@@ -39,8 +39,8 @@ 
             \is_scalar($item) => \var_export($item, true),
             $item instanceof \Closure => $this->renderClosureSignature(new \ReflectionFunction($item)),
             $item instanceof \ReflectionFunctionAbstract => $this->renderClosureSignature($item),
-            $item instanceof \UnitEnum => $item::class . "::$item->name",
-            \is_object($item) => 'instance of ' . $item::class,
+            $item instanceof \UnitEnum => $item::class."::$item->name",
+            \is_object($item) => 'instance of '.$item::class,
             \is_array($item) => $this->renderArray($item),
             default => \gettype($item),
         };
@@ -48,14 +48,14 @@ 
 
     private function renderArray(array $array, int $level = 0): string
     {
-        if ($array === []) {
+        if ($array === []){
             return '[]';
         }
-        if ($level >= self::ARRAY_MAX_LEVEL) {
+        if ($level >= self::ARRAY_MAX_LEVEL){
             return 'array';
         }
         $result = [];
-        foreach ($array as $key => $value) {
+        foreach ($array as $key => $value){
             $result[] = \sprintf(
                 '%s: %s',
                 $key,
@@ -66,6 +66,6 @@ 
         }
 
         $pad = \str_repeat('  ', $level);
-        return "[\n  $pad" . \implode(",\n  $pad", $result) . "\n$pad]";
+        return "[\n  $pad".\implode(",\n  $pad", $result)."\n$pad]";
     }
 }

src/Core/src/Internal/Tracer.php

Spacing +8 added lines, -8 removed lines

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

Braces +13 added lines, -6 removed lines

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

src/Core/src/Internal/Factory.php

Spacing +38 added lines, -38 removed lines

@@ -54,35 +54,35 @@ 
      */
     public function make(string $alias, array $parameters = [], string $context = null): mixed
     {
-        if (!isset($this->state->bindings[$alias])) {
+        if (!isset($this->state->bindings[$alias])){
             $this->tracer->push(false, action: 'autowire', alias: $alias, context: $context);
-            try {
+            try{
                 //No direct instructions how to construct class, make is automatically
                 return $this->autowire($alias, $parameters, $context);
-            } finally {
+            }finally{
                 $this->tracer->pop(false);
             }
         }
 
         $binding = $this->state->bindings[$alias];
-        try {
+        try{
             $this->tracer->push(false, action: 'resolve from binding', alias: $alias, context: $context, binding: $binding);
             $this->tracer->push(true);
 
-            if (\is_object($binding)) {
-                if ($binding::class === WeakReference::class) {
-                    if ($binding->get() === null && \class_exists($alias)) {
-                        try {
+            if (\is_object($binding)){
+                if ($binding::class === WeakReference::class){
+                    if ($binding->get() === null && \class_exists($alias)){
+                        try{
                             $this->tracer->push(false, alias: $alias, source: WeakReference::class, context: $context);
                             $object = $this->createInstance($alias, $parameters, $context);
                             $binding = $this->state->bindings[$alias] = WeakReference::create($object);
-                        } catch (\Throwable) {
+                        }catch (\Throwable){
                             throw new ContainerException($this->tracer->combineTraceMessage(\sprintf(
                                 'Can\'t resolve `%s`: can\'t instantiate `%s` from WeakReference binding.',
                                 $this->tracer->getRootAlias(),
                                 $alias,
                             )));
-                        } finally {
+                        }finally{
                             $this->tracer->pop();
                         }
                     }
@@ -92,26 +92,26 @@ 
                 return $binding;
             }
 
-            if (\is_string($binding)) {
+            if (\is_string($binding)){
                 //Binding is pointing to something else
                 return $this->make($binding, $parameters, $context);
             }
 
             unset($this->state->bindings[$alias]);
-            try {
+            try{
                 $instance = $binding[0] === $alias
                     ? $this->autowire($alias, $parameters, $context)
                     : $this->evaluateBinding($alias, $binding[0], $parameters, $context);
-            } finally {
+            }finally{
                 /** @psalm-var class-string $alias */
                 $this->state->bindings[$alias] = $binding;
             }
-        } finally {
+        }finally{
             $this->tracer->pop(true);
             $this->tracer->pop(false);
         }
 
-        if ($binding[1]) {
+        if ($binding[1]){
             // Indicates singleton
             /** @psalm-var class-string $alias */
             $this->state->bindings[$alias] = $instance;
@@ -130,7 +130,7 @@ 
      */
     private function autowire(string $class, array $parameters, string $context = null): object
     {
-        if (!\class_exists($class) && !isset($this->state->injectors[$class])) {
+        if (!\class_exists($class) && !isset($this->state->injectors[$class])){
             throw new NotFoundException($this->tracer->combineTraceMessage(\sprintf(
                 'Can\'t resolve `%s`: undefined class or binding `%s`.',
                 $this->tracer->getRootAlias(),
@@ -157,18 +157,18 @@ 
         array $parameters,
         string $context = null
     ): mixed {
-        if (\is_string($target)) {
+        if (\is_string($target)){
             // Reference
             return $this->make($target, $parameters, $context);
         }
 
-        if ($target instanceof Autowire) {
+        if ($target instanceof Autowire){
             return $target->resolve($this, $parameters);
         }
 
-        try {
+        try{
             return $this->invoker->invoke($target, $parameters);
-        } catch (NotCallableException $e) {
+        }catch (NotCallableException $e){
             throw new ContainerException(
                 $this->tracer->combineTraceMessage(\sprintf('Invalid binding for `%s`.', $alias)),
                 $e->getCode(),
@@ -192,20 +192,20 @@ 
      */
     private function createInstance(string $class, array $parameters, string $context = null): object
     {
-        try {
+        try{
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         //We have to construct class using external injector when we know exact context
-        if ($parameters === [] && $this->binder->hasInjector($class)) {
+        if ($parameters === [] && $this->binder->hasInjector($class)){
             $injector = $this->state->injectors[$reflection->getName()];
 
-            try {
+            try{
                 $injectorInstance = $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 @@ 
 
                 /** @var InjectorInterface<TObject> $injectorInstance */
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance)){
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'.",
@@ -227,12 +227,12 @@ 
                 }
 
                 return $instance;
-            } finally {
+            }finally{
                 $this->state->injectors[$reflection->getName()] = $injector;
             }
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -245,12 +245,12 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null){
+            try{
                 $this->tracer->push(false, action: 'resolve arguments', signature: $constructor);
                 $this->tracer->push(true);
                 $arguments = $this->resolver->resolveArguments($constructor, $parameters);
-            } catch (ValidationException $e) {
+            }catch (ValidationException $e){
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -260,22 +260,22 @@ 
                         )
                     ),
                 );
-            } finally {
+            }finally{
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-            try {
+            try{
                 // Using constructor with resolved arguments
                 $this->tracer->push(false, call: "$class::__construct", arguments: $arguments);
                 $this->tracer->push(true);
                 $instance = new $class(...$arguments);
-            } catch (\TypeError $e) {
+            }catch (\TypeError $e){
                 throw new WrongTypeException($constructor, $e);
-            } finally {
+            }finally{
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-        } else {
+        }else{
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -293,9 +293,9 @@ 
     private function registerInstance(object $instance, array $parameters): object
     {
         //Declarative singletons (only when class received via direct get)
-        if ($parameters === [] && $instance instanceof SingletonInterface) {
+        if ($parameters === [] && $instance instanceof SingletonInterface){
             $alias = $instance::class;
-            if (!isset($this->state->bindings[$alias])) {
+            if (!isset($this->state->bindings[$alias])){
                 $this->state->bindings[$alias] = $instance;
             }
         }

Braces +89 added lines, -38 removed lines

@@ -54,35 +54,48 @@ 
      */
     public function make(string $alias, array $parameters = [], string $context = null): mixed
     {
-        if (!isset($this->state->bindings[$alias])) {
+        if (!isset($this->state->bindings[$alias]))
+        {
             $this->tracer->push(false, action: 'autowire', alias: $alias, context: $context);
-            try {
+            try
+            {
                 //No direct instructions how to construct class, make is automatically
                 return $this->autowire($alias, $parameters, $context);
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(false);
             }
         }
 
         $binding = $this->state->bindings[$alias];
-        try {
+        try
+        {
             $this->tracer->push(false, action: 'resolve from binding', alias: $alias, context: $context, binding: $binding);
             $this->tracer->push(true);
 
-            if (\is_object($binding)) {
-                if ($binding::class === WeakReference::class) {
-                    if ($binding->get() === null && \class_exists($alias)) {
-                        try {
+            if (\is_object($binding))
+            {
+                if ($binding::class === WeakReference::class)
+                {
+                    if ($binding->get() === null && \class_exists($alias))
+                    {
+                        try
+                        {
                             $this->tracer->push(false, alias: $alias, source: WeakReference::class, context: $context);
                             $object = $this->createInstance($alias, $parameters, $context);
                             $binding = $this->state->bindings[$alias] = WeakReference::create($object);
-                        } catch (\Throwable) {
+                        }
+                        catch (\Throwable)
+                        {
                             throw new ContainerException($this->tracer->combineTraceMessage(\sprintf(
                                 'Can\'t resolve `%s`: can\'t instantiate `%s` from WeakReference binding.',
                                 $this->tracer->getRootAlias(),
                                 $alias,
                             )));
-                        } finally {
+                        }
+                        finally
+                        {
                             $this->tracer->pop();
                         }
                     }
@@ -92,26 +105,33 @@ 
                 return $binding;
             }
 
-            if (\is_string($binding)) {
+            if (\is_string($binding))
+            {
                 //Binding is pointing to something else
                 return $this->make($binding, $parameters, $context);
             }
 
             unset($this->state->bindings[$alias]);
-            try {
+            try
+            {
                 $instance = $binding[0] === $alias
                     ? $this->autowire($alias, $parameters, $context)
                     : $this->evaluateBinding($alias, $binding[0], $parameters, $context);
-            } finally {
+            }
+            finally
+            {
                 /** @psalm-var class-string $alias */
                 $this->state->bindings[$alias] = $binding;
             }
-        } finally {
+        }
+        finally
+        {
             $this->tracer->pop(true);
             $this->tracer->pop(false);
         }
 
-        if ($binding[1]) {
+        if ($binding[1])
+        {
             // Indicates singleton
             /** @psalm-var class-string $alias */
             $this->state->bindings[$alias] = $instance;
@@ -130,7 +150,8 @@ 
      */
     private function autowire(string $class, array $parameters, string $context = null): object
     {
-        if (!\class_exists($class) && !isset($this->state->injectors[$class])) {
+        if (!\class_exists($class) && !isset($this->state->injectors[$class]))
+        {
             throw new NotFoundException($this->tracer->combineTraceMessage(\sprintf(
                 'Can\'t resolve `%s`: undefined class or binding `%s`.',
                 $this->tracer->getRootAlias(),
@@ -157,18 +178,23 @@ 
         array $parameters,
         string $context = null
     ): mixed {
-        if (\is_string($target)) {
+        if (\is_string($target))
+        {
             // Reference
             return $this->make($target, $parameters, $context);
         }
 
-        if ($target instanceof Autowire) {
+        if ($target instanceof Autowire)
+        {
             return $target->resolve($this, $parameters);
         }
 
-        try {
+        try
+        {
             return $this->invoker->invoke($target, $parameters);
-        } catch (NotCallableException $e) {
+        }
+        catch (NotCallableException $e)
+        {
             throw new ContainerException(
                 $this->tracer->combineTraceMessage(\sprintf('Invalid binding for `%s`.', $alias)),
                 $e->getCode(),
@@ -192,20 +218,26 @@ 
      */
     private function createInstance(string $class, array $parameters, string $context = null): object
     {
-        try {
+        try
+        {
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         //We have to construct class using external injector when we know exact context
-        if ($parameters === [] && $this->binder->hasInjector($class)) {
+        if ($parameters === [] && $this->binder->hasInjector($class))
+        {
             $injector = $this->state->injectors[$reflection->getName()];
 
-            try {
+            try
+            {
                 $injectorInstance = $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 +249,8 @@ 
 
                 /** @var InjectorInterface<TObject> $injectorInstance */
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance))
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'.",
@@ -227,12 +260,15 @@ 
                 }
 
                 return $instance;
-            } finally {
+            }
+            finally
+            {
                 $this->state->injectors[$reflection->getName()] = $injector;
             }
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -245,12 +281,16 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 $this->tracer->push(false, action: 'resolve arguments', signature: $constructor);
                 $this->tracer->push(true);
                 $arguments = $this->resolver->resolveArguments($constructor, $parameters);
-            } catch (ValidationException $e) {
+            }
+            catch (ValidationException $e)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -260,22 +300,31 @@ 
                         )
                     ),
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-            try {
+            try
+            {
                 // Using constructor with resolved arguments
                 $this->tracer->push(false, call: "$class::__construct", arguments: $arguments);
                 $this->tracer->push(true);
                 $instance = new $class(...$arguments);
-            } catch (\TypeError $e) {
+            }
+            catch (\TypeError $e)
+            {
                 throw new WrongTypeException($constructor, $e);
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -293,9 +342,11 @@ 
     private function registerInstance(object $instance, array $parameters): object
     {
         //Declarative singletons (only when class received via direct get)
-        if ($parameters === [] && $instance instanceof SingletonInterface) {
+        if ($parameters === [] && $instance instanceof SingletonInterface)
+        {
             $alias = $instance::class;
-            if (!isset($this->state->bindings[$alias])) {
+            if (!isset($this->state->bindings[$alias]))
+            {
                 $this->state->bindings[$alias] = $instance;
             }
         }