spiral / framework

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;

src/Core/src/Exception/Container/ArgumentException.php

Spacing +3 added lines, -3 removed lines

@@ -16,10 +16,10 @@
     public function __construct(
         protected \ReflectionParameter $parameter,
         protected \ReflectionFunctionAbstract $context
-    ) {
+    ){
         $name = $context->getName();
-        if ($context instanceof \ReflectionMethod) {
-            $name = $context->class . '::' . $name;
+        if ($context instanceof \ReflectionMethod){
+            $name = $context->class.'::'.$name;
         }
 
         parent::__construct(\sprintf("Unable to resolve '%s' argument in '%s'", $parameter->name, $name));

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
         protected \ReflectionFunctionAbstract $context
     ) {
         $name = $context->getName();
-        if ($context instanceof \ReflectionMethod) {
+        if ($context instanceof \ReflectionMethod)
+        {
             $name = $context->class . '::' . $name;
         }
 

src/Core/src/Exception/Resolver/UnknownParameterException.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     public function __construct(
         \ReflectionFunctionAbstract $reflection,
         private readonly string $parameter
-    ) {
+    ){
         $pattern = "Unknown named parameter `{$parameter}` `%s` %s.";
         parent::__construct($this->renderFunctionAndParameter($reflection, $pattern));
     }

src/Core/src/Exception/Resolver/ArgumentResolvingException.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     public function __construct(
         \ReflectionFunctionAbstract $reflection,
         private readonly string $parameter
-    ) {
+    ){
         $pattern = "Unable to resolve required argument `{$parameter}` when resolving `%s` %s.";
         parent::__construct($this->renderFunctionAndParameter($reflection, $pattern));
     }

src/Core/src/Exception/Resolver/PositionalArgumentException.php

Spacing +2 added lines, -2 removed lines

@@ -13,13 +13,13 @@
     public function __construct(
         \ReflectionFunctionAbstract $reflection,
         private readonly int $position
-    ) {
+    ){
         $pattern = 'Cannot use positional argument after named argument `%s` %s.';
         parent::__construct($this->renderFunctionAndParameter($reflection, $pattern));
     }
 
     public function getParameter(): string
     {
-        return '#' . $this->position;
+        return '#'.$this->position;
     }
 }

src/Core/src/Exception/Resolver/WrongTypeException.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     {
         $message = 'An argument resolved with wrong type: ';
         parent::__construct(
-            $message . $error->getMessage(),
+            $message.$error->getMessage(),
             $error->getCode(),
             $error
         );

src/Core/src/Exception/Resolver/MissingRequiredArgumentException.php

Spacing +1 added lines, -1 removed lines

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

src/Core/src/Exception/Traits/ClosureRendererTrait.php

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
         $line = $reflection->getStartLine();
 
         $fileAndLine = '';
-        if (!empty($fileName)) {
+        if (!empty($fileName)){
             $fileAndLine = "in \"$fileName\" at line $line";
         }
 
@@ -42,23 +42,23 @@ 
     {
         $closureParameters = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter){
             /** @var ReflectionNamedType|ReflectionUnionType|null $type */
             $type = $parameter->getType();
             $parameterString = \sprintf(
                 '%s %s%s$%s',
                 // type
-                (string) $type,
+                (string)$type,
                 // reference
                 $parameter->isPassedByReference() ? '&' : '',
                 // variadic
                 $parameter->isVariadic() ? '...' : '',
                 $parameter->getName(),
             );
-            if ($parameter->isDefaultValueAvailable()) {
+            if ($parameter->isDefaultValueAvailable()){
                 $default = $parameter->getDefaultValue();
-                $parameterString .= ' = ' . match (true) {
-                    \is_object($default) => 'new ' . $default::class . '(...)',
+                $parameterString .= ' = '.match (true) {
+                    \is_object($default) => 'new '.$default::class.'(...)',
                     $parameter->isDefaultValueConstant() => $parameter->getDefaultValueConstantName(),
                     default => \var_export($default, true),
                 };
@@ -66,6 +66,6 @@ 
             $closureParameters[] = \ltrim($parameterString);
         }
         $static = $reflection->isStatic() ? 'static ' : '';
-        return "{$static}function (" . \implode(', ', $closureParameters) . ')';
+        return "{$static}function (".\implode(', ', $closureParameters).')';
     }
 }

Braces +6 added lines, -3 removed lines

@@ -31,7 +31,8 @@ 
         $line = $reflection->getStartLine();
 
         $fileAndLine = '';
-        if (!empty($fileName)) {
+        if (!empty($fileName))
+        {
             $fileAndLine = "in \"$fileName\" at line $line";
         }
 
@@ -42,7 +43,8 @@ 
     {
         $closureParameters = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter)
+        {
             /** @var ReflectionNamedType|ReflectionUnionType|null $type */
             $type = $parameter->getType();
             $parameterString = \sprintf(
@@ -55,7 +57,8 @@ 
                 $parameter->isVariadic() ? '...' : '',
                 $parameter->getName(),
             );
-            if ($parameter->isDefaultValueAvailable()) {
+            if ($parameter->isDefaultValueAvailable())
+            {
                 $default = $parameter->getDefaultValue();
                 $parameterString .= ' = ' . match (true) {
                     \is_object($default) => 'new ' . $default::class . '(...)',