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/tests/ExceptionsTest.php

Spacing +4 added lines, -4 removed lines

@@ -79,9 +79,9 @@ 
 
         $this->expectException(ContainerException::class);
 
-        try {
+        try{
             $container->get(WithContainerInside::class);
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             $this->assertSame(
                 \preg_replace('/\s+/', '', 'Can\'tresolve`Spiral\Tests\Core\Fixtures\
                     WithContainerInside`:undefinedclassorbinding`Spiral\Tests\Core\Fixtures\InvalidClass`.
@@ -101,9 +101,9 @@ 
     {
         $this->expectException(ContainerException::class);
 
-        try {
+        try{
             $container->get(ClassWithUndefinedDependency::class);
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             $this->assertSame(
                 \preg_replace('/\s+/', '', $message),
                 \preg_replace('/\s+/', '', $e->getMessage())

Braces +10 added lines, -4 removed lines

@@ -79,9 +79,12 @@ 
 
         $this->expectException(ContainerException::class);
 
-        try {
+        try
+        {
             $container->get(WithContainerInside::class);
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             $this->assertSame(
                 \preg_replace('/\s+/', '', 'Can\'tresolve`Spiral\Tests\Core\Fixtures\
                     WithContainerInside`:undefinedclassorbinding`Spiral\Tests\Core\Fixtures\InvalidClass`.
@@ -101,9 +104,12 @@ 
     {
         $this->expectException(ContainerException::class);
 
-        try {
+        try
+        {
             $container->get(ClassWithUndefinedDependency::class);
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             $this->assertSame(
                 \preg_replace('/\s+/', '', $message),
                 \preg_replace('/\s+/', '', $e->getMessage())

src/Core/src/Internal/Trace.php

Spacing +4 added lines, -4 removed lines

@@ -13,16 +13,16 @@
         public readonly string $alias,
         public readonly string $information,
         public ?string $context = null
-    ) {
+    ){
         $this->context ??= '-';
     }
 
     public function __toString(): string
     {
         $result = [];
-        $result[] = '- ' . $this->alias;
-        $result[] = '    Info: ' . $this->information;
-        $result[] = '    Context: ' . $this->context;
+        $result[] = '- '.$this->alias;
+        $result[] = '    Info: '.$this->information;
+        $result[] = '    Context: '.$this->context;
 
         return \implode(PHP_EOL, $result);
     }

src/Core/src/Internal/Tracer.php

Braces +4 added lines, -2 removed lines

@@ -43,10 +43,12 @@
     public function __toString(): string
     {
         $result = [];
-        if ($this->traces !== []) {
+        if ($this->traces !== [])
+        {
             $result[] = 'Container trace list:';
 
-            foreach ($this->traces as $item) {
+            foreach ($this->traces as $item)
+            {
                 $result[] = (string) $item;
             }
         }

Spacing +4 added lines, -4 removed lines

@@ -17,11 +17,11 @@ 
     public function __toString(): string
     {
         $result = [];
-        if ($this->traces !== []) {
+        if ($this->traces !== []){
             $result[] = 'Container trace list:';
 
-            foreach ($this->traces as $item) {
-                $result[] = (string) $item;
+            foreach ($this->traces as $item){
+                $result[] = (string)$item;
             }
         }
 
@@ -33,7 +33,7 @@ 
         $this->trace($alias, 'Autowiring', $context);
     }
 
-    public function traceBinding(string $alias, string|array|object $binding, string $context = null): void
+    public function traceBinding(string $alias, string | array | object $binding, string $context = null): void
     {
         $message = match (true) {
             \is_string($binding) => \sprintf('Binding found `%s`', $binding),

src/Core/src/Exception/Container/ContainerException.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@
         int $code = 0,
         ?\Throwable $previous = null,
         protected ?Tracer $tracer = null
-    ) {
-        parent::__construct($tracer !== null ? $message . PHP_EOL . $tracer : $message, $code, $previous);
+    ){
+        parent::__construct($tracer !== null ? $message.PHP_EOL.$tracer : $message, $code, $previous);
     }
 }

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/Internal/Factory.php

Spacing +27 added lines, -27 removed lines

@@ -53,7 +53,7 @@ 
      */
     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->traceAutowire($alias, $context);
             //No direct instructions how to construct class, make is automatically
             return $this->autowire($alias, $parameters, $context);
@@ -62,9 +62,9 @@ 
         $binding = $this->state->bindings[$alias];
         $this->tracer->traceBinding($alias, $binding, $context);
 
-        if (\is_object($binding)) {
-            if ($binding::class === WeakReference::class) {
-                if ($binding->get() === null && \class_exists($alias)) {
+        if (\is_object($binding)){
+            if ($binding::class === WeakReference::class){
+                if ($binding->get() === null && \class_exists($alias)){
                     $object = $this->createInstance($alias, $parameters, $context);
                     $binding = $this->state->bindings[$alias] = WeakReference::create($object);
                 }
@@ -74,23 +74,23 @@ 
             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;
             $this->tracer->clean();
         }
 
-        if ($binding[1]) {
+        if ($binding[1]){
             // Indicates singleton
             /** @psalm-var class-string $alias */
             $this->state->bindings[$alias] = $instance;
@@ -109,7 +109,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(\sprintf(
                 'Can\'t resolve `%s`: undefined class or binding `%s`.',
                 $this->tracer->getRootConstructedClass(),
@@ -136,18 +136,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(
                 \sprintf('Invalid binding for `%s`.', $alias),
                 $e->getCode(),
@@ -172,20 +172,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, $this->tracer);
         }
 
         //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'.",
@@ -197,7 +197,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'.",
@@ -207,12 +207,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',
@@ -228,14 +228,14 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null){
+            try{
                 // Using constructor with resolved arguments
                 $instance = new $class(...$this->resolver->resolveArguments($constructor, $parameters));
-            } catch (\TypeError $e) {
+            }catch (\TypeError $e){
                 throw new WrongTypeException($constructor, $e);
             }
-        } else {
+        }else{
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -253,9 +253,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 +60 added lines, -27 removed lines

@@ -53,7 +53,8 @@ 
      */
     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->traceAutowire($alias, $context);
             //No direct instructions how to construct class, make is automatically
             return $this->autowire($alias, $parameters, $context);
@@ -62,9 +63,12 @@ 
         $binding = $this->state->bindings[$alias];
         $this->tracer->traceBinding($alias, $binding, $context);
 
-        if (\is_object($binding)) {
-            if ($binding::class === WeakReference::class) {
-                if ($binding->get() === null && \class_exists($alias)) {
+        if (\is_object($binding))
+        {
+            if ($binding::class === WeakReference::class)
+            {
+                if ($binding->get() === null && \class_exists($alias))
+                {
                     $object = $this->createInstance($alias, $parameters, $context);
                     $binding = $this->state->bindings[$alias] = WeakReference::create($object);
                 }
@@ -74,23 +78,28 @@ 
             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;
             $this->tracer->clean();
         }
 
-        if ($binding[1]) {
+        if ($binding[1])
+        {
             // Indicates singleton
             /** @psalm-var class-string $alias */
             $this->state->bindings[$alias] = $instance;
@@ -109,7 +118,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(\sprintf(
                 'Can\'t resolve `%s`: undefined class or binding `%s`.',
                 $this->tracer->getRootConstructedClass(),
@@ -136,18 +146,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(
                 \sprintf('Invalid binding for `%s`.', $alias),
                 $e->getCode(),
@@ -172,20 +187,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, $this->tracer);
         }
 
         //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'.",
@@ -197,7 +218,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'.",
@@ -207,12 +229,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',
@@ -228,14 +253,20 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 // Using constructor with resolved arguments
                 $instance = new $class(...$this->resolver->resolveArguments($constructor, $parameters));
-            } catch (\TypeError $e) {
+            }
+            catch (\TypeError $e)
+            {
                 throw new WrongTypeException($constructor, $e);
             }
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -253,9 +284,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;
             }
         }