spiral / framework

src/Core/tests/InvokerTest.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
         $this->container->bindSingleton(Bucket::class, $bucket = new Bucket('foo'));
 
         $result = $this->container->invoke(
-            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') {
+            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz'){
                 return \compact('bucket', 'class', 'name', 'path');
             },
             ['name' => 'bar']
@@ -113,7 +113,7 @@ 
         $this->expectErrorMessage('Unable to resolve required argument `name` when resolving');
 
         $this->container->invoke(
-            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') {
+            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz'){
                 return \compact('bucket', 'class', 'name', 'path');
             },
             ['name' => 'bar']

Braces +4 added lines, -2 removed lines

@@ -95,7 +95,8 @@ 
         $this->container->bindSingleton(Bucket::class, $bucket = new Bucket('foo'));
 
         $result = $this->container->invoke(
-            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') {
+            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz')
+            {
                 return \compact('bucket', 'class', 'name', 'path');
             },
             ['name' => 'bar']
@@ -113,7 +114,8 @@ 
         $this->expectErrorMessage('Unable to resolve required argument `name` when resolving');
 
         $this->container->invoke(
-            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') {
+            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz')
+            {
                 return \compact('bucket', 'class', 'name', 'path');
             },
             ['name' => 'bar']

src/Core/src/Internal/Binder.php

Spacing +13 added lines, -13 removed lines

@@ -38,9 +38,9 @@ 
      *
      * @psalm-param TResolver|object $resolver
      */
-    public function bind(string $alias, string|array|callable|object $resolver): void
+    public function bind(string $alias, string | array | callable | object $resolver): void
     {
-        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire) {
+        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire){
             // array means = execute me, false = not singleton
             $this->state->bindings[$alias] = [$resolver, false];
 
@@ -56,9 +56,9 @@ 
      *
      * @psalm-param TResolver|object $resolver
      */
-    public function bindSingleton(string $alias, string|array|callable|object $resolver): void
+    public function bindSingleton(string $alias, string | array | callable | object $resolver): void
     {
-        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire) {
+        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire){
             // direct binding to an instance
             $this->state->bindings[$alias] = $resolver;
 
@@ -73,12 +73,12 @@ 
      */
     public function hasInstance(string $alias): bool
     {
-        if (!$this->container->has($alias)) {
+        if (!$this->container->has($alias)){
             return false;
         }
         $bindings = &$this->state->bindings;
 
-        while (isset($bindings[$alias]) && \is_string($bindings[$alias])) {
+        while (isset($bindings[$alias]) && \is_string($bindings[$alias])){
             //Checking alias tree
             $alias = $bindings[$alias];
         }
@@ -111,31 +111,31 @@ 
 
     public function hasInjector(string $class): bool
     {
-        try {
+        try{
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (\array_key_exists($class, $this->state->injectors)) {
+        if (\array_key_exists($class, $this->state->injectors)){
             return $this->state->injectors[$class] !== null;
         }
 
         if (
             $reflection->implementsInterface(InjectableInterface::class)
             && $reflection->hasConstant('INJECTOR')
-        ) {
+        ){
             $this->state->injectors[$class] = $reflection->getConstant('INJECTOR');
 
             return true;
         }
 
         // check interfaces
-        foreach ($this->state->injectors as $target => $injector) {
+        foreach ($this->state->injectors as $target => $injector){
             if (
                 \class_exists($target, true)
                 && $reflection->isSubclassOf($target)
-            ) {
+            ){
                 $this->state->injectors[$class] = $injector;
 
                 return true;
@@ -144,7 +144,7 @@ 
             if (
                 \interface_exists($target, true)
                 && $reflection->implementsInterface($target)
-            ) {
+            ){
                 $this->state->injectors[$class] = $injector;
 
                 return true;

Braces +17 added lines, -8 removed lines

@@ -40,7 +40,8 @@ 
      */
     public function bind(string $alias, string|array|callable|object $resolver): void
     {
-        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire) {
+        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire)
+        {
             // array means = execute me, false = not singleton
             $this->state->bindings[$alias] = [$resolver, false];
 
@@ -58,7 +59,8 @@ 
      */
     public function bindSingleton(string $alias, string|array|callable|object $resolver): void
     {
-        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire) {
+        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire)
+        {
             // direct binding to an instance
             $this->state->bindings[$alias] = $resolver;
 
@@ -73,12 +75,14 @@ 
      */
     public function hasInstance(string $alias): bool
     {
-        if (!$this->container->has($alias)) {
+        if (!$this->container->has($alias))
+        {
             return false;
         }
         $bindings = &$this->state->bindings;
 
-        while (isset($bindings[$alias]) && \is_string($bindings[$alias])) {
+        while (isset($bindings[$alias]) && \is_string($bindings[$alias]))
+        {
             //Checking alias tree
             $alias = $bindings[$alias];
         }
@@ -111,13 +115,17 @@ 
 
     public function hasInjector(string $class): bool
     {
-        try {
+        try
+        {
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (\array_key_exists($class, $this->state->injectors)) {
+        if (\array_key_exists($class, $this->state->injectors))
+        {
             return $this->state->injectors[$class] !== null;
         }
 
@@ -131,7 +139,8 @@ 
         }
 
         // check interfaces
-        foreach ($this->state->injectors as $target => $injector) {
+        foreach ($this->state->injectors as $target => $injector)
+        {
             if (
                 \class_exists($target, true)
                 && $reflection->isSubclassOf($target)

src/Core/src/Internal/DestructorTrait.php

Spacing +3 added lines, -3 removed lines

@@ -12,14 +12,14 @@
     public function destruct(): void
     {
         $class = new \ReflectionClass($this);
-        foreach ($class->getProperties() as $property) {
+        foreach ($class->getProperties() as $property){
             $name = $property->getName();
-            if (!isset($this->$name)) {
+            if (!isset($this->$name)){
                 continue;
             }
             $value = $this->$name;
             unset($this->$name);
-            if (\is_object($value) && \method_exists($value, 'destruct')) {
+            if (\is_object($value) && \method_exists($value, 'destruct')){
                 $value->destruct();
             }
         }

Braces +6 added lines, -3 removed lines

@@ -12,14 +12,17 @@
     public function destruct(): void
     {
         $class = new \ReflectionClass($this);
-        foreach ($class->getProperties() as $property) {
+        foreach ($class->getProperties() as $property)
+        {
             $name = $property->getName();
-            if (!isset($this->$name)) {
+            if (!isset($this->$name))
+            {
                 continue;
             }
             $value = $this->$name;
             unset($this->$name);
-            if (\is_object($value) && \method_exists($value, 'destruct')) {
+            if (\is_object($value) && \method_exists($value, 'destruct'))
+            {
                 $value->destruct();
             }
         }

src/Core/src/Internal/Registry.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public function __construct(
         private Config $config,
         private array $objects = [],
-    ) {
+    ){
     }
 
     public function set(string $name, object $value): void

src/Core/src/Internal/ResolvingState.php

Spacing +12 added lines, -12 removed lines

@@ -23,15 +23,15 @@ 
     public function __construct(
         public readonly ReflectionFunctionAbstract $reflection,
         private array $arguments,
-    ) {
+    ){
         $this->modeNamed = $this->isNamedMode();
     }
 
     public function addResolvedValue(mixed &$value, string $key = null): void
     {
-        if ($key === null) {
+        if ($key === null){
             $this->resolvedValues[] = &$value;
-        } else {
+        }else{
             $this->resolvedValues[$key] = &$value;
         }
     }
@@ -42,25 +42,25 @@ 
             ? $parameter->getName()
             : $parameter->getPosition();
 
-        if (!\array_key_exists($key, $this->arguments)) {
+        if (!\array_key_exists($key, $this->arguments)){
             return [];
         }
         $_val = &$this->arguments[$key];
 
-        if ($variadic && \is_array($_val)) {
+        if ($variadic && \is_array($_val)){
             // Save keys is possible
             $positional = true;
             $result = [];
-            foreach ($_val as $key => &$item) {
-                if (!$positional && \is_int($key)) {
+            foreach ($_val as $key => &$item){
+                if (!$positional && \is_int($key)){
                     throw new ResolvingException(
                         'Cannot use positional argument after named argument during unpacking named variadic argument.'
                     );
                 }
                 $positional = $positional && \is_int($key);
-                if ($positional) {
+                if ($positional){
                     $result[] = &$item;
-                } else {
+                }else{
                     $result[$key] = &$item;
                 }
             }
@@ -78,10 +78,10 @@ 
     {
         $nums = 0;
         $strings = 0;
-        foreach ($this->arguments as $key => $_) {
-            if (\is_int($key)) {
+        foreach ($this->arguments as $key => $_){
+            if (\is_int($key)){
                 ++$nums;
-            } else {
+            }else{
                 ++$strings;
             }
         }

Braces +25 added lines, -11 removed lines

@@ -29,9 +29,12 @@ 
 
     public function addResolvedValue(mixed &$value, string $key = null): void
     {
-        if ($key === null) {
+        if ($key === null)
+        {
             $this->resolvedValues[] = &$value;
-        } else {
+        }
+        else
+        {
             $this->resolvedValues[$key] = &$value;
         }
     }
@@ -42,25 +45,32 @@ 
             ? $parameter->getName()
             : $parameter->getPosition();
 
-        if (!\array_key_exists($key, $this->arguments)) {
+        if (!\array_key_exists($key, $this->arguments))
+        {
             return [];
         }
         $_val = &$this->arguments[$key];
 
-        if ($variadic && \is_array($_val)) {
+        if ($variadic && \is_array($_val))
+        {
             // Save keys is possible
             $positional = true;
             $result = [];
-            foreach ($_val as $key => &$item) {
-                if (!$positional && \is_int($key)) {
+            foreach ($_val as $key => &$item)
+            {
+                if (!$positional && \is_int($key))
+                {
                     throw new ResolvingException(
                         'Cannot use positional argument after named argument during unpacking named variadic argument.'
                     );
                 }
                 $positional = $positional && \is_int($key);
-                if ($positional) {
+                if ($positional)
+                {
                     $result[] = &$item;
-                } else {
+                }
+                else
+                {
                     $result[$key] = &$item;
                 }
             }
@@ -78,10 +88,14 @@ 
     {
         $nums = 0;
         $strings = 0;
-        foreach ($this->arguments as $key => $_) {
-            if (\is_int($key)) {
+        foreach ($this->arguments as $key => $_)
+        {
+            if (\is_int($key))
+            {
                 ++$nums;
-            } else {
+            }
+            else
+            {
                 ++$strings;
             }
         }

src/Core/src/Internal/Invoker.php

Spacing +8 added lines, -8 removed lines

@@ -35,18 +35,18 @@ 
      */
     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 (i.e. [ClassName::class, 'method'])
-            if (\is_string($resolver)) {
+            if (\is_string($resolver)){
                 $resolver = $this->container->get($resolver);
             }
 
-            try {
+            try{
                 $method = new \ReflectionMethod($resolver, $method);
-            } catch (\ReflectionException $e) {
+            }catch (\ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -57,14 +57,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 +18 added lines, -8 removed lines

@@ -35,18 +35,23 @@ 
      */
     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 (i.e. [ClassName::class, 'method'])
-            if (\is_string($resolver)) {
+            if (\is_string($resolver))
+            {
                 $resolver = $this->container->get($resolver);
             }
 
-            try {
+            try
+            {
                 $method = new \ReflectionMethod($resolver, $method);
-            } catch (\ReflectionException $e) {
+            }
+            catch (\ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -57,14 +62,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/Container.php

Braces +2 added lines, -1 removed lines

@@ -50,7 +50,8 @@
      */
     public function get(string|Autowire $id, string $context = null): mixed
     {
-        if ($id instanceof Autowire) {
+        if ($id instanceof Autowire)
+        {
             return $id->resolve($this->factory);
         }
 

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
     use DestructorTrait;
 
     private State $state;
-    private FactoryInterface|Factory $factory;
+    private FactoryInterface | Factory $factory;
 
     public function __construct(Registry $constructor)
     {
@@ -46,9 +46,9 @@ 
      * @throws ContainerException
      * @throws \Throwable
      */
-    public function get(string|Autowire $id, string $context = null): mixed
+    public function get(string | Autowire $id, string $context = null): mixed
     {
-        if ($id instanceof Autowire) {
+        if ($id instanceof Autowire){
             return $id->resolve($this->factory);
         }
 

src/Core/src/Internal/Resolver.php

Spacing +35 added lines, -35 removed lines

@@ -49,7 +49,7 @@ 
     ): array {
         $state = new ResolvingState($reflection, $parameters);
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter){
             $this->resolveParameter($parameter, $state, $validate)
             or
             throw new ArgumentResolvingException($reflection, $parameter->getName());
@@ -63,46 +63,46 @@ 
         $positional = true;
         $variadic = false;
         $parameters = $reflection->getParameters();
-        if (\count($parameters) === 0) {
+        if (\count($parameters) === 0){
             return;
         }
 
         $parameter = null;
-        while (\count($parameters) > 0 || \count($arguments) > 0) {
+        while (\count($parameters) > 0 || \count($arguments) > 0){
             // get related argument value
             $key = \key($arguments);
 
             // For a variadic parameter it's no sense - named or positional argument will be sent
             // But you can't send positional argument after named in any case
-            if (\is_int($key) && !$positional) {
+            if (\is_int($key) && !$positional){
                 throw new PositionalArgumentException($reflection, $key);
             }
 
             $positional = $positional && \is_int($key);
 
-            if (!$variadic) {
+            if (!$variadic){
                 $parameter = \array_shift($parameters);
                 $variadic = $parameter?->isVariadic() ?? false;
             }
 
-            if ($parameter === null) {
+            if ($parameter === null){
                 throw new UnknownParameterException($reflection, $key);
             }
             $name = $parameter->getName();
 
-            if (($positional || $variadic) && $key !== null) {
+            if (($positional || $variadic) && $key !== null){
                 $value = \array_shift($arguments);
-            } elseif ($key === null || !\array_key_exists($name, $arguments)) {
-                if ($parameter->isOptional()) {
+            } elseif ($key === null || !\array_key_exists($name, $arguments)){
+                if ($parameter->isOptional()){
                     continue;
                 }
                 throw new MissingRequiredArgumentException($reflection, $name);
-            } else {
+            }else{
                 $value = &$arguments[$name];
                 unset($arguments[$name]);
             }
 
-            if (!$this->validateValueToParameter($parameter, $value)) {
+            if (!$this->validateValueToParameter($parameter, $value)){
                 throw new InvalidArgumentException($reflection, $name);
             }
         }
@@ -110,7 +110,7 @@ 
 
     private function validateValueToParameter(ReflectionParameter $parameter, mixed $value): bool
     {
-        if (!$parameter->hasType() || ($parameter->allowsNull() && $value === null)) {
+        if (!$parameter->hasType() || ($parameter->allowsNull() && $value === null)){
             return true;
         }
         $type = $parameter->getType();
@@ -121,17 +121,17 @@ 
             $type instanceof ReflectionIntersectionType => [false, $type->getTypes()],
         };
 
-        foreach ($types as $t) {
+        foreach ($types as $t){
             \assert($t instanceof ReflectionNamedType);
-            if (!$this->validateValueNamedType($t, $value)) {
+            if (!$this->validateValueNamedType($t, $value)){
                 // If it is TypeIntersection
-                if ($or) {
+                if ($or){
                     continue;
                 }
                 return false;
             }
             // If it is not type intersection then we can skip that value after first successful check
-            if ($or) {
+            if ($or){
                 return true;
             }
         }
@@ -146,7 +146,7 @@ 
     {
         $name = $type->getName();
 
-        if ($type->isBuiltin()) {
+        if ($type->isBuiltin()){
             return match ($name) {
                 'mixed' => true,
                 'string' => \is_string($value),
@@ -179,13 +179,13 @@ 
 
         // Try to resolve parameter by name
         $res = $state->resolveParameterByNameOrPosition($parameter, $isVariadic);
-        if ($res !== [] || $isVariadic) {
+        if ($res !== [] || $isVariadic){
             // validate
-            if ($isVariadic) {
-                foreach ($res as $k => &$v) {
-                    $this->processArgument($state, $v, validateWith: $validate ? $parameter : null, key: $k);
+            if ($isVariadic){
+                foreach ($res as $k => &$v){
+                    $this->processArgument($state, $v, validateWith: $validate ? $parameter : null, key : $k);
                 }
-            } else {
+            }else{
                 $this->processArgument($state, $res[0], validateWith: $validate ? $parameter : null);
             }
 
@@ -193,39 +193,39 @@ 
         }
 
         $error = null;
-        if ($hasType) {
+        if ($hasType){
             /** @var ReflectionIntersectionType|ReflectionUnionType|ReflectionNamedType $reflectionType */
             $reflectionType = $parameter->getType();
 
-            if ($reflectionType instanceof ReflectionIntersectionType) {
+            if ($reflectionType instanceof ReflectionIntersectionType){
                 throw new UnsupportedTypeException($parameter->getDeclaringFunction(), $parameter->getName());
             }
 
             $types = $reflectionType instanceof ReflectionNamedType ? [$reflectionType] : $reflectionType->getTypes();
-            foreach ($types as $namedType) {
-                try {
-                    if ($this->resolveNamedType($state, $parameter, $namedType, $validate)) {
+            foreach ($types as $namedType){
+                try{
+                    if ($this->resolveNamedType($state, $parameter, $namedType, $validate)){
                         return true;
                     }
-                } catch (Throwable $e) {
+                }catch (Throwable $e){
                     $error = $e;
                 }
             }
         }
 
-        if ($parameter->isDefaultValueAvailable()) {
+        if ($parameter->isDefaultValueAvailable()){
             $argument = $parameter->getDefaultValue();
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($hasType && $parameter->allowsNull()) {
+        if ($hasType && $parameter->allowsNull()){
             $argument = null;
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($error === null) {
+        if ($error === null){
             return false;
         }
 
@@ -246,7 +246,7 @@ 
         ReflectionParameter $parameter,
         ReflectionNamedType $typeRef,
         bool $validate
-    ) {
+    ){
         return !$typeRef->isBuiltin() && $this->resolveObjectParameter(
             $state,
             $typeRef->getName(),
@@ -289,15 +289,15 @@ 
         ResolvingState $state,
         mixed &$value,
         ReflectionParameter $validateWith = null,
-        int|string $key = null
+        int | string $key = null
     ): void {
         // Resolve Autowire objects
-        if ($value instanceof Autowire) {
+        if ($value instanceof Autowire){
             $value = $value->resolve($this->factory);
         }
 
         // Validation
-        if ($validateWith !== null && !$this->validateValueToParameter($validateWith, $value)) {
+        if ($validateWith !== null && !$this->validateValueToParameter($validateWith, $value)){
             throw new InvalidArgumentException(
                 $validateWith->getDeclaringFunction(),
                 $validateWith->getName()

Braces +68 added lines, -32 removed lines

@@ -49,7 +49,8 @@ 
     ): array {
         $state = new ResolvingState($reflection, $parameters);
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter)
+        {
             $this->resolveParameter($parameter, $state, $validate)
             or
             throw new ArgumentResolvingException($reflection, $parameter->getName());
@@ -63,46 +64,58 @@ 
         $positional = true;
         $variadic = false;
         $parameters = $reflection->getParameters();
-        if (\count($parameters) === 0) {
+        if (\count($parameters) === 0)
+        {
             return;
         }
 
         $parameter = null;
-        while (\count($parameters) > 0 || \count($arguments) > 0) {
+        while (\count($parameters) > 0 || \count($arguments) > 0)
+        {
             // get related argument value
             $key = \key($arguments);
 
             // For a variadic parameter it's no sense - named or positional argument will be sent
             // But you can't send positional argument after named in any case
-            if (\is_int($key) && !$positional) {
+            if (\is_int($key) && !$positional)
+            {
                 throw new PositionalArgumentException($reflection, $key);
             }
 
             $positional = $positional && \is_int($key);
 
-            if (!$variadic) {
+            if (!$variadic)
+            {
                 $parameter = \array_shift($parameters);
                 $variadic = $parameter?->isVariadic() ?? false;
             }
 
-            if ($parameter === null) {
+            if ($parameter === null)
+            {
                 throw new UnknownParameterException($reflection, $key);
             }
             $name = $parameter->getName();
 
-            if (($positional || $variadic) && $key !== null) {
+            if (($positional || $variadic) && $key !== null)
+            {
                 $value = \array_shift($arguments);
-            } elseif ($key === null || !\array_key_exists($name, $arguments)) {
-                if ($parameter->isOptional()) {
+            }
+            elseif ($key === null || !\array_key_exists($name, $arguments))
+            {
+                if ($parameter->isOptional())
+                {
                     continue;
                 }
                 throw new MissingRequiredArgumentException($reflection, $name);
-            } else {
+            }
+            else
+            {
                 $value = &$arguments[$name];
                 unset($arguments[$name]);
             }
 
-            if (!$this->validateValueToParameter($parameter, $value)) {
+            if (!$this->validateValueToParameter($parameter, $value))
+            {
                 throw new InvalidArgumentException($reflection, $name);
             }
         }
@@ -110,7 +123,8 @@ 
 
     private function validateValueToParameter(ReflectionParameter $parameter, mixed $value): bool
     {
-        if (!$parameter->hasType() || ($parameter->allowsNull() && $value === null)) {
+        if (!$parameter->hasType() || ($parameter->allowsNull() && $value === null))
+        {
             return true;
         }
         $type = $parameter->getType();
@@ -121,17 +135,21 @@ 
             $type instanceof ReflectionIntersectionType => [false, $type->getTypes()],
         };
 
-        foreach ($types as $t) {
+        foreach ($types as $t)
+        {
             \assert($t instanceof ReflectionNamedType);
-            if (!$this->validateValueNamedType($t, $value)) {
+            if (!$this->validateValueNamedType($t, $value))
+            {
                 // If it is TypeIntersection
-                if ($or) {
+                if ($or)
+                {
                     continue;
                 }
                 return false;
             }
             // If it is not type intersection then we can skip that value after first successful check
-            if ($or) {
+            if ($or)
+            {
                 return true;
             }
         }
@@ -146,7 +164,8 @@ 
     {
         $name = $type->getName();
 
-        if ($type->isBuiltin()) {
+        if ($type->isBuiltin())
+        {
             return match ($name) {
                 'mixed' => true,
                 'string' => \is_string($value),
@@ -179,13 +198,18 @@ 
 
         // Try to resolve parameter by name
         $res = $state->resolveParameterByNameOrPosition($parameter, $isVariadic);
-        if ($res !== [] || $isVariadic) {
+        if ($res !== [] || $isVariadic)
+        {
             // validate
-            if ($isVariadic) {
-                foreach ($res as $k => &$v) {
+            if ($isVariadic)
+            {
+                foreach ($res as $k => &$v)
+                {
                     $this->processArgument($state, $v, validateWith: $validate ? $parameter : null, key: $k);
                 }
-            } else {
+            }
+            else
+            {
                 $this->processArgument($state, $res[0], validateWith: $validate ? $parameter : null);
             }
 
@@ -193,39 +217,49 @@ 
         }
 
         $error = null;
-        if ($hasType) {
+        if ($hasType)
+        {
             /** @var ReflectionIntersectionType|ReflectionUnionType|ReflectionNamedType $reflectionType */
             $reflectionType = $parameter->getType();
 
-            if ($reflectionType instanceof ReflectionIntersectionType) {
+            if ($reflectionType instanceof ReflectionIntersectionType)
+            {
                 throw new UnsupportedTypeException($parameter->getDeclaringFunction(), $parameter->getName());
             }
 
             $types = $reflectionType instanceof ReflectionNamedType ? [$reflectionType] : $reflectionType->getTypes();
-            foreach ($types as $namedType) {
-                try {
-                    if ($this->resolveNamedType($state, $parameter, $namedType, $validate)) {
+            foreach ($types as $namedType)
+            {
+                try
+                {
+                    if ($this->resolveNamedType($state, $parameter, $namedType, $validate))
+                    {
                         return true;
                     }
-                } catch (Throwable $e) {
+                }
+                catch (Throwable $e)
+                {
                     $error = $e;
                 }
             }
         }
 
-        if ($parameter->isDefaultValueAvailable()) {
+        if ($parameter->isDefaultValueAvailable())
+        {
             $argument = $parameter->getDefaultValue();
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($hasType && $parameter->allowsNull()) {
+        if ($hasType && $parameter->allowsNull())
+        {
             $argument = null;
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($error === null) {
+        if ($error === null)
+        {
             return false;
         }
 
@@ -292,12 +326,14 @@ 
         int|string $key = null
     ): void {
         // Resolve Autowire objects
-        if ($value instanceof Autowire) {
+        if ($value instanceof Autowire)
+        {
             $value = $value->resolve($this->factory);
         }
 
         // Validation
-        if ($validateWith !== null && !$this->validateValueToParameter($validateWith, $value)) {
+        if ($validateWith !== null && !$this->validateValueToParameter($validateWith, $value))
+        {
             throw new InvalidArgumentException(
                 $validateWith->getDeclaringFunction(),
                 $validateWith->getName()

src/Core/src/Container/Autowire.php

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
     public function __construct(
         private readonly string $alias,
         private readonly array $parameters = []
-    ) {
+    ){
     }
 
     public static function __set_state(array $anArray): static
@@ -41,22 +41,22 @@ 
      */
     public static function wire(mixed $definition): Autowire
     {
-        if ($definition instanceof self) {
+        if ($definition instanceof self){
             return $definition;
         }
 
-        if (\is_string($definition)) {
+        if (\is_string($definition)){
             return new self($definition);
         }
 
-        if (\is_array($definition) && isset($definition['class'])) {
+        if (\is_array($definition) && isset($definition['class'])){
             return new self(
                 $definition['class'],
                 $definition['options'] ?? $definition['params'] ?? []
             );
         }
 
-        if (\is_object($definition)) {
+        if (\is_object($definition)){
             $autowire = new self($definition::class, []);
             $autowire->target = $definition;
             return $autowire;

Braces +8 added lines, -4 removed lines

@@ -41,22 +41,26 @@
      */
     public static function wire(mixed $definition): Autowire
     {
-        if ($definition instanceof self) {
+        if ($definition instanceof self)
+        {
             return $definition;
         }
 
-        if (\is_string($definition)) {
+        if (\is_string($definition))
+        {
             return new self($definition);
         }
 
-        if (\is_array($definition) && isset($definition['class'])) {
+        if (\is_array($definition) && isset($definition['class']))
+        {
             return new self(
                 $definition['class'],
                 $definition['options'] ?? $definition['params'] ?? []
             );
         }
 
-        if (\is_object($definition)) {
+        if (\is_object($definition))
+        {
             $autowire = new self($definition::class, []);
             $autowire->target = $definition;
             return $autowire;