spiral / framework

src/Core/src/Internal/Resolver.php

Spacing +40 added lines, -40 removed lines

@@ -53,7 +53,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());
@@ -67,47 +67,47 @@ 
         $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){
                 /** @psalm-suppress ReferenceReusedFromConfusingScope */
                 $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);
             }
         }
@@ -115,7 +115,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();
@@ -126,17 +126,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;
             }
         }
@@ -151,7 +151,7 @@ 
     {
         $name = $type->getName();
 
-        if ($type->isBuiltin()) {
+        if ($type->isBuiltin()){
             return match ($name) {
                 'mixed' => true,
                 'string' => \is_string($value),
@@ -184,13 +184,13 @@ 
 
         // Try to resolve parameter by name
         $res = $state->resolveParameterByNameOrPosition($param, $isVariadic);
-        if ($res !== [] || $isVariadic) {
+        if ($res !== [] || $isVariadic){
             // validate
-            if ($isVariadic) {
-                foreach ($res as $k => &$v) {
-                    $this->processArgument($state, $v, validateWith: $validate ? $param : null, key: $k);
+            if ($isVariadic){
+                foreach ($res as $k => &$v){
+                    $this->processArgument($state, $v, validateWith: $validate ? $param : null, key : $k);
                 }
-            } else {
+            }else{
                 $this->processArgument($state, $res[0], validateWith: $validate ? $param : null);
             }
 
@@ -198,38 +198,38 @@ 
         }
 
         $error = null;
-        while ($hasType) {
+        while ($hasType){
             /** @var ReflectionIntersectionType|ReflectionUnionType|ReflectionNamedType $refType */
             $refType = $param->getType();
 
-            if ($refType::class === ReflectionNamedType::class) {
-                if ($refType->isBuiltin()) {
+            if ($refType::class === ReflectionNamedType::class){
+                if ($refType->isBuiltin()){
                     break;
                 }
 
-                if (\interface_exists($refType->getName()) && !empty($param->getAttributes(ProxyAttribute::class))) {
+                if (\interface_exists($refType->getName()) && !empty($param->getAttributes(ProxyAttribute::class))){
                     $proxy = Proxy::create(new \ReflectionClass($refType->getName()), $param);
                     $this->processArgument($state, $proxy);
                     return true;
                 }
 
-                try {
-                    if ($this->resolveObject($state, $refType, $param, $validate)) {
+                try{
+                    if ($this->resolveObject($state, $refType, $param, $validate)){
                         return true;
                     }
-                } catch (Throwable $e) {
+                }catch (Throwable $e){
                     $error = $e;
                 }
                 break;
             }
 
-            if ($refType::class === ReflectionUnionType::class) {
-                foreach ($refType->getTypes() as $namedType) {
-                    try {
-                        if (!$namedType->isBuiltin() && $this->resolveObject($state, $namedType, $param, $validate)) {
+            if ($refType::class === ReflectionUnionType::class){
+                foreach ($refType->getTypes() as $namedType){
+                    try{
+                        if (!$namedType->isBuiltin() && $this->resolveObject($state, $namedType, $param, $validate)){
                             return true;
                         }
-                    } catch (Throwable $e) {
+                    }catch (Throwable $e){
                         $error = $e;
                     }
                 }
@@ -239,19 +239,19 @@ 
             throw new UnsupportedTypeException($param->getDeclaringFunction(), $param->getName());
         }
 
-        if ($param->isDefaultValueAvailable()) {
+        if ($param->isDefaultValueAvailable()){
             $argument = $param->getDefaultValue();
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($hasType && $param->allowsNull()) {
+        if ($hasType && $param->allowsNull()){
             $argument = null;
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($error === null) {
+        if ($error === null){
             return false;
         }
 
@@ -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 +81 added lines, -38 removed lines

@@ -53,7 +53,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());
@@ -67,47 +68,59 @@ 
         $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)
+            {
                 /** @psalm-suppress ReferenceReusedFromConfusingScope */
                 $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);
             }
         }
@@ -115,7 +128,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();
@@ -126,17 +140,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;
             }
         }
@@ -151,7 +169,8 @@ 
     {
         $name = $type->getName();
 
-        if ($type->isBuiltin()) {
+        if ($type->isBuiltin())
+        {
             return match ($name) {
                 'mixed' => true,
                 'string' => \is_string($value),
@@ -184,13 +203,18 @@ 
 
         // Try to resolve parameter by name
         $res = $state->resolveParameterByNameOrPosition($param, $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 ? $param : null, key: $k);
                 }
-            } else {
+            }
+            else
+            {
                 $this->processArgument($state, $res[0], validateWith: $validate ? $param : null);
             }
 
@@ -198,38 +222,52 @@ 
         }
 
         $error = null;
-        while ($hasType) {
+        while ($hasType)
+        {
             /** @var ReflectionIntersectionType|ReflectionUnionType|ReflectionNamedType $refType */
             $refType = $param->getType();
 
-            if ($refType::class === ReflectionNamedType::class) {
-                if ($refType->isBuiltin()) {
+            if ($refType::class === ReflectionNamedType::class)
+            {
+                if ($refType->isBuiltin())
+                {
                     break;
                 }
 
-                if (\interface_exists($refType->getName()) && !empty($param->getAttributes(ProxyAttribute::class))) {
+                if (\interface_exists($refType->getName()) && !empty($param->getAttributes(ProxyAttribute::class)))
+                {
                     $proxy = Proxy::create(new \ReflectionClass($refType->getName()), $param);
                     $this->processArgument($state, $proxy);
                     return true;
                 }
 
-                try {
-                    if ($this->resolveObject($state, $refType, $param, $validate)) {
+                try
+                {
+                    if ($this->resolveObject($state, $refType, $param, $validate))
+                    {
                         return true;
                     }
-                } catch (Throwable $e) {
+                }
+                catch (Throwable $e)
+                {
                     $error = $e;
                 }
                 break;
             }
 
-            if ($refType::class === ReflectionUnionType::class) {
-                foreach ($refType->getTypes() as $namedType) {
-                    try {
-                        if (!$namedType->isBuiltin() && $this->resolveObject($state, $namedType, $param, $validate)) {
+            if ($refType::class === ReflectionUnionType::class)
+            {
+                foreach ($refType->getTypes() as $namedType)
+                {
+                    try
+                    {
+                        if (!$namedType->isBuiltin() && $this->resolveObject($state, $namedType, $param, $validate))
+                        {
                             return true;
                         }
-                    } catch (Throwable $e) {
+                    }
+                    catch (Throwable $e)
+                    {
                         $error = $e;
                     }
                 }
@@ -239,19 +277,22 @@ 
             throw new UnsupportedTypeException($param->getDeclaringFunction(), $param->getName());
         }
 
-        if ($param->isDefaultValueAvailable()) {
+        if ($param->isDefaultValueAvailable())
+        {
             $argument = $param->getDefaultValue();
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($hasType && $param->allowsNull()) {
+        if ($hasType && $param->allowsNull())
+        {
             $argument = null;
             $this->processArgument($state, $argument);
             return true;
         }
 
-        if ($error === null) {
+        if ($error === null)
+        {
             return false;
         }
 
@@ -292,12 +333,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/Internal/Proxy/ProxyClassRenderer.php

Spacing +16 added lines, -16 removed lines

@@ -16,23 +16,23 @@ 
 
         $interface = $type->getName();
         $classBody = [];
-        foreach ($type->getMethods() as $method) {
-            if ($method->isConstructor()) {
+        foreach ($type->getMethods() as $method){
+            if ($method->isConstructor()){
                 continue;
             }
 
             $hasRefs = false;
             $return = $method->hasReturnType() && (string)$method->getReturnType() === 'void' ? '' : 'return ';
-            $call = ($method->isStatic() ? '::' : '->') . $method->getName();
+            $call = ($method->isStatic() ? '::' : '->').$method->getName();
             $context = $method->isStatic() ? 'null' : '$this->__container_proxy_context';
 
             $args = [];
-            foreach ($method->getParameters() as $param) {
+            foreach ($method->getParameters() as $param){
                 $hasRefs = $hasRefs || $param->isPassedByReference();
-                $args[] = ($param->isVariadic() ? '...' : '') . '$'. $param->getName();
+                $args[] = ($param->isVariadic() ? '...' : '').'$'.$param->getName();
             }
 
-            if (!$hasRefs && !$method->isVariadic()) {
+            if (!$hasRefs && !$method->isVariadic()){
                 $classBody[] = self::renderMethod($method, <<<PHP
                     {$return}\\Spiral\\Core\\Internal\\Proxy\\Resolver::resolve(
                         '{$interface}',
@@ -44,7 +44,7 @@ 
 
             $argsStr = \implode(', ', $args);
 
-            if ($method->isVariadic()) {
+            if ($method->isVariadic()){
                 $classBody[] = self::renderMethod($method, <<<PHP
                     {$return}\\Spiral\\Core\\Internal\\Proxy\\Resolver::resolve(
                         '{$interface}',
@@ -83,7 +83,7 @@ 
             $m->getName(),
             \implode(', ', \array_map([self::class, 'renderParameter'], $m->getParameters())),
             $m->hasReturnType()
-                ? ': ' . self::renderParameterTypes($m->getReturnType(), $m->getDeclaringClass())
+                ? ': '.self::renderParameterTypes($m->getReturnType(), $m->getDeclaringClass())
                 : '',
             $body,
         );
@@ -96,15 +96,15 @@ 
             $param->hasType() ? self::renderParameterTypes($param->getType(), $param->getDeclaringClass()) : '',
             $param->isPassedByReference() ? '&' : '',
             $param->isVariadic() ? '...' : '',
-            '$' . $param->getName(),
-            $param->isOptional() && !$param->isVariadic() ? ' = ' . self::renderDefaultValue($param) : '',
+            '$'.$param->getName(),
+            $param->isOptional() && !$param->isVariadic() ? ' = '.self::renderDefaultValue($param) : '',
         ), ' ');
     }
 
     public static function renderParameterTypes(\ReflectionType $types, \ReflectionClass $class): string
     {
-        if ($types instanceof \ReflectionNamedType) {
-            return ($types->allowsNull() && $types->getName() !== 'mixed' ? '?' : '') . ($types->isBuiltin()
+        if ($types instanceof \ReflectionNamedType){
+            return ($types->allowsNull() && $types->getName() !== 'mixed' ? '?' : '').($types->isBuiltin()
                 ? $types->getName()
                 : self::normalizeClassType($types, $class));
         }
@@ -116,7 +116,7 @@ 
         };
 
         $result = [];
-        foreach ($types as $type) {
+        foreach ($types as $type){
             $result[] = $type->isBuiltin()
                 ? $type->getName()
                 : self::normalizeClassType($type, $class);
@@ -127,12 +127,12 @@ 
 
     public static function renderDefaultValue(\ReflectionParameter $param): string
     {
-        if ($param->isDefaultValueConstant()) {
+        if ($param->isDefaultValueConstant()){
             $result = $param->getDefaultValueConstantName();
 
             return \explode('::', $result)[0] === 'self'
                 ? $result
-                : '\\' . $result;
+                : '\\'.$result;
         }
 
         $cut = self::cutDefaultValue($param);
@@ -144,7 +144,7 @@ 
 
     public static function normalizeClassType(\ReflectionNamedType $type, \ReflectionClass $class): string
     {
-        return '\\' . ($type->getName() === 'self' ? $class->getName() : $type->getName());
+        return '\\'.($type->getName() === 'self' ? $class->getName() : $type->getName());
     }
 
     private static function cutDefaultValue(\ReflectionParameter $param): string

Braces +16 added lines, -8 removed lines

@@ -16,8 +16,10 @@ 
 
         $interface = $type->getName();
         $classBody = [];
-        foreach ($type->getMethods() as $method) {
-            if ($method->isConstructor()) {
+        foreach ($type->getMethods() as $method)
+        {
+            if ($method->isConstructor())
+            {
                 continue;
             }
 
@@ -27,12 +29,14 @@ 
             $context = $method->isStatic() ? 'null' : '$this->__container_proxy_context';
 
             $args = [];
-            foreach ($method->getParameters() as $param) {
+            foreach ($method->getParameters() as $param)
+            {
                 $hasRefs = $hasRefs || $param->isPassedByReference();
                 $args[] = ($param->isVariadic() ? '...' : '') . '$'. $param->getName();
             }
 
-            if (!$hasRefs && !$method->isVariadic()) {
+            if (!$hasRefs && !$method->isVariadic())
+            {
                 $classBody[] = self::renderMethod($method, <<<PHP
                     {$return}\\Spiral\\Core\\Internal\\Proxy\\Resolver::resolve(
                         '{$interface}',
@@ -44,7 +48,8 @@ 
 
             $argsStr = \implode(', ', $args);
 
-            if ($method->isVariadic()) {
+            if ($method->isVariadic())
+            {
                 $classBody[] = self::renderMethod($method, <<<PHP
                     {$return}\\Spiral\\Core\\Internal\\Proxy\\Resolver::resolve(
                         '{$interface}',
@@ -103,7 +108,8 @@ 
 
     public static function renderParameterTypes(\ReflectionType $types, \ReflectionClass $class): string
     {
-        if ($types instanceof \ReflectionNamedType) {
+        if ($types instanceof \ReflectionNamedType)
+        {
             return ($types->allowsNull() && $types->getName() !== 'mixed' ? '?' : '') . ($types->isBuiltin()
                 ? $types->getName()
                 : self::normalizeClassType($types, $class));
@@ -116,7 +122,8 @@ 
         };
 
         $result = [];
-        foreach ($types as $type) {
+        foreach ($types as $type)
+        {
             $result[] = $type->isBuiltin()
                 ? $type->getName()
                 : self::normalizeClassType($type, $class);
@@ -127,7 +134,8 @@ 
 
     public static function renderDefaultValue(\ReflectionParameter $param): string
     {
-        if ($param->isDefaultValueConstant()) {
+        if ($param->isDefaultValueConstant())
+        {
             $result = $param->getDefaultValueConstantName();
 
             return \explode('::', $result)[0] === 'self'

src/Core/src/Internal/Proxy/Resolver.php

Spacing +3 added lines, -3 removed lines

@@ -12,15 +12,15 @@
  */
 final class Resolver
 {
-    public static function resolve(string $alias, \Stringable|string|null $context = null): object
+    public static function resolve(string $alias, \Stringable | string | null $context = null): object
     {
         $c = ContainerScope::getContainer() ?? throw new ContainerException('Proxy is out of scope.');
 
-        try {
+        try{
             $result = $c->get($alias, $context) ?? throw new ContainerException(
                 'Resolved `null` from the container.',
             );
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             throw new ContainerException(
                 // todo : find required scope
                 \sprintf('Unable to resolve `%s` in a Proxy.', $alias),

Braces +5 added lines, -2 removed lines

@@ -16,11 +16,14 @@
     {
         $c = ContainerScope::getContainer() ?? throw new ContainerException('Proxy is out of scope.');
 
-        try {
+        try
+        {
             $result = $c->get($alias, $context) ?? throw new ContainerException(
                 'Resolved `null` from the container.',
             );
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             throw new ContainerException(
                 // todo : find required scope
                 \sprintf('Unable to resolve `%s` in a Proxy.', $alias),

src/Core/src/Internal/Proxy/ProxyTrait.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 trait ProxyTrait
 {
     private static string $__container_proxy_alias;
-    private \Stringable|string|null $__container_proxy_context = null;
+    private \Stringable | string | null $__container_proxy_context = null;
 
     public function __call(string $name, array $arguments)
     {