spiral / framework

src/Core/tests/Scope/FiberHelper.php

Spacing +11 added lines, -11 removed lines

@@ -22,11 +22,11 @@ 
     {
         $fiber = new Fiber($callable);
         $value = $fiber->start();
-        while (!$fiber->isTerminated()) {
-            if ($check !== null) {
-                try {
+        while (!$fiber->isTerminated()){
+            if ($check !== null){
+                try{
                     $value = $check($value);
-                } catch (\Throwable $e) {
+                }catch (\Throwable $e){
                     $value = $fiber->throw($e);
                     continue;
                 }
@@ -50,14 +50,14 @@ 
         /** Values that were suspended by the fiber. */
         $suspends = [];
         $results = [];
-        foreach ($callables as $key => $callable) {
+        foreach ($callables as $key => $callable){
             $fiberGenerators[$key] = (static function () use ($callable) {
                 $fiber = new Fiber($callable);
                 // Get ready
                 yield null;
 
                 $value = yield $fiber->start();
-                while (!$fiber->isTerminated()) {
+                while (!$fiber->isTerminated()){
                     $value = yield $fiber->resume($value);
                 }
                 return $fiber->getReturn();
@@ -67,15 +67,15 @@ 
         }
 
 
-        while ($fiberGenerators !== []) {
-            foreach ($fiberGenerators as $key => $generator) {
-                try {
+        while ($fiberGenerators !== []){
+            foreach ($fiberGenerators as $key => $generator){
+                try{
                     $suspends[$key] = $generator->send($suspends[$key]);
-                    if (!$generator->valid()) {
+                    if (!$generator->valid()){
                         $results[$key] = $generator->getReturn();
                         unset($fiberGenerators[$key]);
                     }
-                } catch (\Throwable $e) {
+                }catch (\Throwable $e){
                     unset($fiberGenerators[$key]);
                     $results[$key] = $e;
                 }

Braces +26 added lines, -12 removed lines

@@ -22,11 +22,16 @@ 
     {
         $fiber = new Fiber($callable);
         $value = $fiber->start();
-        while (!$fiber->isTerminated()) {
-            if ($check !== null) {
-                try {
+        while (!$fiber->isTerminated())
+        {
+            if ($check !== null)
+            {
+                try
+                {
                     $value = $check($value);
-                } catch (\Throwable $e) {
+                }
+                catch (\Throwable $e)
+                {
                     $value = $fiber->throw($e);
                     continue;
                 }
@@ -50,14 +55,17 @@ 
         /** Values that were suspended by the fiber. */
         $suspends = [];
         $results = [];
-        foreach ($callables as $key => $callable) {
-            $fiberGenerators[$key] = (static function () use ($callable) {
+        foreach ($callables as $key => $callable)
+        {
+            $fiberGenerators[$key] = (static function () use ($callable)
+            {
                 $fiber = new Fiber($callable);
                 // Get ready
                 yield null;
 
                 $value = yield $fiber->start();
-                while (!$fiber->isTerminated()) {
+                while (!$fiber->isTerminated())
+                {
                     $value = yield $fiber->resume($value);
                 }
                 return $fiber->getReturn();
@@ -67,15 +75,21 @@ 
         }
 
 
-        while ($fiberGenerators !== []) {
-            foreach ($fiberGenerators as $key => $generator) {
-                try {
+        while ($fiberGenerators !== [])
+        {
+            foreach ($fiberGenerators as $key => $generator)
+            {
+                try
+                {
                     $suspends[$key] = $generator->send($suspends[$key]);
-                    if (!$generator->valid()) {
+                    if (!$generator->valid())
+                    {
                         $results[$key] = $generator->getReturn();
                         unset($fiberGenerators[$key]);
                     }
-                } catch (\Throwable $e) {
+                }
+                catch (\Throwable $e)
+                {
                     unset($fiberGenerators[$key]);
                     $results[$key] = $e;
                 }

src/Core/tests/Scope/UseCaseTest.php

Braces +18 added lines, -9 removed lines

@@ -28,7 +28,8 @@ 
         $root = new Container();
         $root->bind('foo', SampleClass::class);
 
-        $root->runScoped(function (ContainerInterface $c1) {
+        $root->runScoped(function (ContainerInterface $c1)
+        {
             $c1->get('foo');
         }, bindings: ['foo' => SampleClass::class]);
 
@@ -61,7 +62,8 @@ 
     {
         $root = new Container();
 
-        $root->runScoped(function (ContainerInterface $c1) use ($theSame, $alias) {
+        $root->runScoped(function (ContainerInterface $c1) use ($theSame, $alias)
+        {
             $obj1 = $c1->get($alias);
             $obj2 = $c1->get($alias);
 
@@ -86,14 +88,16 @@ 
     {
         $root = new Container();
 
-        $root->runScoped(function (ContainerInterface $c1) use ($root) {
+        $root->runScoped(function (ContainerInterface $c1) use ($root)
+        {
             $obj1 = $c1->get('foo');
             $this->weakMap->offsetSet($obj1, true);
 
             self::assertNotSame($root, $c1);
             self::assertInstanceOf(stdClass::class, $obj1);
 
-            $c1->runScoped(function (ContainerInterface $c2) use ($root, $c1, $obj1) {
+            $c1->runScoped(function (ContainerInterface $c2) use ($root, $c1, $obj1)
+            {
                 $obj2 = $c2->get('foo');
                 $this->weakMap->offsetSet($obj2, true);
 
@@ -122,14 +126,16 @@ 
         $root->bindSingleton('bar', [Factory::class, 'makeStdClass']);
         $root->bind(stdClass::class, new stdClass());
 
-        $root->runScoped(function (ContainerInterface $c1) use ($root) {
+        $root->runScoped(function (ContainerInterface $c1) use ($root)
+        {
             $obj1 = $c1->get('foo');
             $this->weakMap->offsetSet($obj1, true);
 
             self::assertInstanceOf(stdClass::class, $obj1);
             // Singleton must be the same
             self::assertSame($c1->get('bar'), $root->get('bar'));
-            $c1->runScoped(function (ContainerInterface $c2) use ($root, $obj1) {
+            $c1->runScoped(function (ContainerInterface $c2) use ($root, $obj1)
+            {
                 $obj2 = $c2->get('foo');
 
                 self::assertInstanceOf(stdClass::class, $obj2);
@@ -262,7 +268,8 @@ 
     {
         $root = new Container();
 
-        $root->invoke(static function () use ($root) {
+        $root->invoke(static function () use ($root)
+        {
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
         });
@@ -271,7 +278,8 @@ 
     public function testRegisterContainerOnGet(): void
     {
         $root = new Container();
-        $root->bind('foo', function () use ($root) {
+        $root->bind('foo', function () use ($root)
+        {
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
         });
@@ -282,7 +290,8 @@ 
     public function testRegisterContainerOnMake(): void
     {
         $root = new Container();
-        $root->bind('foo', function () use ($root) {
+        $root->bind('foo', function () use ($root)
+        {
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
         });

src/Core/src/Scope.php

Spacing +1 added lines, -1 removed lines

@@ -23,6 +23,6 @@
         public readonly ?string $name = null,
         public readonly array $bindings = [],
         public readonly bool $autowire = true,
-    ) {
+    ){
     }
 }

src/Core/src/Container.php

Braces +46 added lines, -21 removed lines

@@ -170,23 +170,29 @@ 
      */
     public function runScope(Scope|array $bindings, callable $scope): mixed
     {
-        if (!\is_array($bindings)) {
+        if (!\is_array($bindings))
+        {
             return $this->runIsolatedScope($bindings, $scope);
         }
 
         $binds = &$this->state->bindings;
         $singletons = &$this->state->singletons;
         $cleanup = $previous = $prevSin = [];
-        foreach ($bindings as $alias => $resolver) {
+        foreach ($bindings as $alias => $resolver)
+        {
             // Store previous bindings
-            if (isset($binds[$alias])) {
+            if (isset($binds[$alias]))
+            {
                 $previous[$alias] = $binds[$alias];
-            } else {
+            }
+            else
+            {
                 // Store bindings to be removed
                 $cleanup[] = $alias;
             }
             // Store previous singletons
-            if (isset($singletons[$alias])) {
+            if (isset($singletons[$alias]))
+            {
                 $prevSin[$alias] = $singletons[$alias];
                 unset($singletons[$alias]);
             }
@@ -194,21 +200,27 @@ 
             $this->binder->bind($alias, $resolver);
         }
 
-        try {
+        try
+        {
             return ContainerScope::getContainer() !== $this
                 ? ContainerScope::runScope($this, $scope)
                 : $scope($this);
-        } finally {
+        }
+        finally
+        {
             // Remove new bindings
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias)
+            {
                 unset($binds[$alias], $singletons[$alias]);
             }
             // Restore previous bindings
-            foreach ($previous as $alias => $resolver) {
+            foreach ($previous as $alias => $resolver)
+            {
                 $binds[$alias] = $resolver;
             }
             // Restore singletons
-            foreach ($prevSin as $alias => $instance) {
+            foreach ($prevSin as $alias => $instance)
+            {
                 $singletons[$alias] = $instance;
             }
         }
@@ -265,7 +277,8 @@ 
      */
     public function bindSingleton(string $alias, string|array|callable|object $resolver, bool $force = true): void
     {
-        if ($force) {
+        if ($force)
+        {
             $this->binder->removeBinding($alias);
         }
 
@@ -336,8 +349,10 @@ 
         ]);
 
         // Create container services
-        foreach ($container->config as $property => $class) {
-            if (\property_exists($container, $property)) {
+        foreach ($container->config as $property => $class)
+        {
+            if (\property_exists($container, $property))
+            {
                 $container->$property = $constructor->get($property, $class);
             }
         }
@@ -351,7 +366,8 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope))
+        {
             $this->destruct();
             return;
         }
@@ -360,10 +376,14 @@ 
 
         // Run finalizers
         $errors = [];
-        foreach ($this->state->finalizers as $finalizer) {
-            try {
+        foreach ($this->state->finalizers as $finalizer)
+        {
+            try
+            {
                 $this->invoker->invoke($finalizer);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 $errors[] = $e;
             }
         }
@@ -372,7 +392,8 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== [])
+        {
             throw new FinalizersException($scopeName, $errors);
         }
     }
@@ -394,18 +415,22 @@ 
         $container->scope->setParent($this, $this->scope);
 
         // Add specific bindings
-        foreach ($config->bindings as $alias => $resolver) {
+        foreach ($config->bindings as $alias => $resolver)
+        {
             $container->binder->bind($alias, $resolver);
         }
 
         return ContainerScope::runScope(
             $container,
             static function (self $container) use ($config, $closure): mixed {
-                try {
+                try
+                {
                     return $config->autowire
                         ? $container->invoke($closure)
                         : $closure($container);
-                } finally {
+                }
+                finally
+                {
                     $container->closeScope();
                 }
             }

Spacing +31 added lines, -31 removed lines

@@ -47,11 +47,11 @@ 
     public const DEFAULT_ROOT_SCOPE_NAME = 'root';
 
     private Internal\State $state;
-    private ResolverInterface|Internal\Resolver $resolver;
-    private FactoryInterface|Internal\Factory $factory;
-    private ContainerInterface|Internal\Container $container;
-    private BinderInterface|Internal\Binder $binder;
-    private InvokerInterface|Internal\Invoker $invoker;
+    private ResolverInterface | Internal\Resolver $resolver;
+    private FactoryInterface | Internal\Factory $factory;
+    private ContainerInterface | Internal\Container $container;
+    private BinderInterface | Internal\Binder $binder;
+    private InvokerInterface | Internal\Invoker $invoker;
     private Internal\Scope $scope;
 
     /**
@@ -60,7 +60,7 @@ 
     public function __construct(
         private Config $config = new Config(),
         ?string $scopeName = self::DEFAULT_ROOT_SCOPE_NAME,
-    ) {
+    ){
         $this->initServices($this, $scopeName);
 
         /** @psalm-suppress RedundantPropertyInitializationCheck */
@@ -112,7 +112,7 @@ 
      * @throws \Throwable
      * @psalm-suppress TooManyArguments
      */
-    public function make(string $alias, array $parameters = [], \Stringable|string|null $context = null): mixed
+    public function make(string $alias, array $parameters = [], \Stringable | string | null $context = null): mixed
     {
         return ContainerScope::getContainer() === $this
             ? $this->factory->make($alias, $parameters, $context)
@@ -138,7 +138,7 @@ 
      * @throws \Throwable
      * @psalm-suppress TooManyArguments
      */
-    public function get(string|Autowire $id, \Stringable|string|null $context = null): mixed
+    public function get(string | Autowire $id, \Stringable | string | null $context = null): mixed
     {
         return ContainerScope::getContainer() === $this
             ? $this->container->get($id, $context)
@@ -168,25 +168,25 @@ 
     /**
      * @throws \Throwable
      */
-    public function runScope(Scope|array $bindings, callable $scope): mixed
+    public function runScope(Scope | array $bindings, callable $scope): mixed
     {
-        if (!\is_array($bindings)) {
+        if (!\is_array($bindings)){
             return $this->runIsolatedScope($bindings, $scope);
         }
 
         $binds = &$this->state->bindings;
         $singletons = &$this->state->singletons;
         $cleanup = $previous = $prevSin = [];
-        foreach ($bindings as $alias => $resolver) {
+        foreach ($bindings as $alias => $resolver){
             // Store previous bindings
-            if (isset($binds[$alias])) {
+            if (isset($binds[$alias])){
                 $previous[$alias] = $binds[$alias];
-            } else {
+            }else{
                 // Store bindings to be removed
                 $cleanup[] = $alias;
             }
             // Store previous singletons
-            if (isset($singletons[$alias])) {
+            if (isset($singletons[$alias])){
                 $prevSin[$alias] = $singletons[$alias];
                 unset($singletons[$alias]);
             }
@@ -194,21 +194,21 @@ 
             $this->binder->bind($alias, $resolver);
         }
 
-        try {
+        try{
             return ContainerScope::getContainer() !== $this
                 ? ContainerScope::runScope($this, $scope)
                 : $scope($this);
-        } finally {
+        }finally{
             // Remove new bindings
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias){
                 unset($binds[$alias], $singletons[$alias]);
             }
             // Restore previous bindings
-            foreach ($previous as $alias => $resolver) {
+            foreach ($previous as $alias => $resolver){
                 $binds[$alias] = $resolver;
             }
             // Restore singletons
-            foreach ($prevSin as $alias => $instance) {
+            foreach ($prevSin as $alias => $instance){
                 $singletons[$alias] = $instance;
             }
         }
@@ -254,9 +254,9 @@ 
      * @param bool $force If the value is false, an exception will be thrown when attempting
      *  to bind an already constructed singleton.
      */
-    public function bindSingleton(string $alias, string|array|callable|object $resolver, bool $force = true): void
+    public function bindSingleton(string $alias, string | array | callable | object $resolver, bool $force = true): void
     {
-        if ($force) {
+        if ($force){
             $this->binder->removeBinding($alias);
         }
 
@@ -327,8 +327,8 @@ 
         ]);
 
         // Create container services
-        foreach ($container->config as $property => $class) {
-            if (\property_exists($container, $property)) {
+        foreach ($container->config as $property => $class){
+            if (\property_exists($container, $property)){
                 $container->$property = $constructor->get($property, $class);
             }
         }
@@ -342,7 +342,7 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope)){
             $this->destruct();
             return;
         }
@@ -351,10 +351,10 @@ 
 
         // Run finalizers
         $errors = [];
-        foreach ($this->state->finalizers as $finalizer) {
-            try {
+        foreach ($this->state->finalizers as $finalizer){
+            try{
                 $this->invoker->invoke($finalizer);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 $errors[] = $e;
             }
         }
@@ -363,7 +363,7 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== []){
             throw new FinalizersException($scopeName, $errors);
         }
     }
@@ -385,18 +385,18 @@ 
         $container->scope->setParent($this, $this->scope);
 
         // Add specific bindings
-        foreach ($config->bindings as $alias => $resolver) {
+        foreach ($config->bindings as $alias => $resolver){
             $container->binder->bind($alias, $resolver);
         }
 
         return ContainerScope::runScope(
             $container,
             static function (self $container) use ($config, $closure): mixed {
-                try {
+                try{
                     return $config->autowire
                         ? $container->invoke($closure)
                         : $closure($container);
-                } finally {
+                }finally{
                     $container->closeScope();
                 }
             }

src/Core/tests/Scope/Stub/ScopedProxyStdClass.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 {
     public function __construct(
         #[Proxy] public ContextInterface $context,
-    ) {
+    ){
     }
 
     public function getContext(): ContextInterface

src/Core/tests/Scope/Stub/Context.php

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@
 final class Context implements ContextInterface
 {
     public function __construct(
-        public \Stringable|string|null $value,
-    ) {
+        public \Stringable | string | null $value,
+    ){
     }
 
-    public function getValue(): \Stringable|string|null
+    public function getValue(): \Stringable | string | null
     {
         return $this->value;
     }

src/Core/tests/Scope/Stub/ContextInterface.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 
 interface ContextInterface
 {
-    public function getValue(): \Stringable|string|null;
+    public function getValue(): \Stringable | string | null;
 }

src/Core/src/Internal/Proxy.php

Spacing +6 added lines, -6 removed lines

@@ -19,19 +19,19 @@ 
      * @param \ReflectionClass<TClass> $type
      * @return TClass
      */
-    public static function create(\ReflectionClass $type, \Stringable|string|null $context): object
+    public static function create(\ReflectionClass $type, \Stringable | string | null $context): object
     {
         $interface = $type->getName();
 
-        if (!\array_key_exists($interface, self::$cache)) {
+        if (!\array_key_exists($interface, self::$cache)){
             /** @var class-string<TClass> $className */
             $className = "{$type->getNamespaceName()}\\{$type->getShortName()} SCOPED PROXY";
 
-            try {
+            try{
                 $classString = ProxyClassRenderer::renderClass($type, $className);
 
                 eval($classString);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 throw new \Error("Unable to create proxy for `{$interface}`: {$e->getMessage()}", 0, $e);
             }
 
@@ -40,12 +40,12 @@ 
 
             // Store in cache without context
             self::$cache[$interface] = $instance;
-        } else {
+        }else{
             /** @var TClass $instance */
             $instance = self::$cache[$interface];
         }
 
-        if ($context !== null) {
+        if ($context !== null){
             $instance = clone $instance;
             (static fn() => $instance->__container_proxy_context = $context)->bindTo(null, $instance::class)();
         }

Braces +12 added lines, -5 removed lines

@@ -23,15 +23,19 @@ 
     {
         $interface = $type->getName();
 
-        if (!\array_key_exists($interface, self::$cache)) {
+        if (!\array_key_exists($interface, self::$cache))
+        {
             /** @var class-string<TClass> $className */
             $className = "{$type->getNamespaceName()}\\{$type->getShortName()} SCOPED PROXY";
 
-            try {
+            try
+            {
                 $classString = ProxyClassRenderer::renderClass($type, $className);
 
                 eval($classString);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 throw new \Error("Unable to create proxy for `{$interface}`: {$e->getMessage()}", 0, $e);
             }
 
@@ -40,12 +44,15 @@ 
 
             // Store in cache without context
             self::$cache[$interface] = $instance;
-        } else {
+        }
+        else
+        {
             /** @var TClass $instance */
             $instance = self::$cache[$interface];
         }
 
-        if ($context !== null) {
+        if ($context !== null)
+        {
             $instance = clone $instance;
             (static fn() => $instance->__container_proxy_context = $context)->bindTo(null, $instance::class)();
         }

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()