spiral / framework

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

src/Core/src/Internal/Factory.php

Spacing +62 added lines, -62 removed lines

@@ -66,19 +66,19 @@ 
      *
      * @throws \Throwable
      */
-    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
     {
-        if ($parameters === [] && \array_key_exists($alias, $this->state->singletons)) {
+        if ($parameters === [] && \array_key_exists($alias, $this->state->singletons)){
             return $this->state->singletons[$alias];
         }
 
         $binding = $this->state->bindings[$alias] ?? null;
 
-        if ($binding === null) {
+        if ($binding === null){
             return $this->resolveWithoutBinding($alias, $parameters, $context);
         }
 
-        try {
+        try{
             $this->tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -106,7 +106,7 @@ 
                     ->resolveWeakReference($binding, $alias, $context, $parameters),
                 default => $binding,
             };
-        } finally {
+        }finally{
             $this->state->bindings[$alias] ??= $binding;
             $this->tracer->pop(true);
             $this->tracer->pop(false);
@@ -120,18 +120,18 @@ 
     private function resolveInjector(Injectable $binding, Ctx $ctx, array $arguments)
     {
         $context = $ctx->context;
-        try {
+        try{
             $reflection = $ctx->reflection ??= new \ReflectionClass($ctx->class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         $injector = $binding->injector;
 
-        try {
+        try{
             $injectorInstance = \is_object($injector) ? $injector : $this->container->get($injector);
 
-            if (!$injectorInstance instanceof InjectorInterface) {
+            if (!$injectorInstance instanceof InjectorInterface){
                 throw new InjectionException(
                     \sprintf(
                         "Class '%s' must be an instance of InjectorInterface for '%s'.",
@@ -158,7 +158,7 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance)){
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -168,7 +168,7 @@ 
             }
 
             return $instance;
-        } finally {
+        }finally{
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -176,18 +176,18 @@ 
     private function resolveAlias(
         \Spiral\Core\Config\Alias $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): mixed {
         $result = $binding->alias === $alias
             ? $this->autowire(
-                new Ctx(alias: $alias, class: $binding->alias, context: $context, singleton: $binding->singleton),
+                new Ctx(alias : $alias, class : $binding->alias, context : $context, singleton : $binding->singleton),
                 $arguments,
             )
             //Binding is pointing to something else
             : $this->make($binding->alias, $arguments, $context);
 
-        if ($binding->singleton && $arguments === []) {
+        if ($binding->singleton && $arguments === []){
             $this->state->singletons[$alias] = $result;
         }
 
@@ -197,13 +197,13 @@ 
     private function resolveShared(
         \Spiral\Core\Config\Shared $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): object {
         $avoidCache = $arguments !== [];
         return $avoidCache
             ? $this->createInstance(
-                new Ctx(alias: $alias, class: $binding->value::class, context: $context),
+                new Ctx(alias : $alias, class : $binding->value::class, context : $context),
                 $arguments,
             )
             : $binding->value;
@@ -212,7 +212,7 @@ 
     private function resolveAutowire(
         \Spiral\Core\Config\Autowire $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): mixed {
         $instance = $binding->autowire->resolve($this, $arguments);
@@ -222,17 +222,17 @@ 
     }
 
     private function resolveFactory(
-        \Spiral\Core\Config\Factory|DeferredFactory $binding,
+        \Spiral\Core\Config\Factory | DeferredFactory $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton);
-        try {
+        try{
             $instance = $binding::class === \Spiral\Core\Config\Factory::class && $binding->getParametersCount() === 0
                 ? ($binding->factory)()
                 : $this->invoker->invoke($binding->factory, $arguments);
-        } catch (NotCallableException $e) {
+        }catch (NotCallableException $e){
             throw new ContainerException(
                 $this->tracer->combineTraceMessage(\sprintf('Invalid binding for `%s`.', $ctx->alias)),
                 $e->getCode(),
@@ -246,24 +246,24 @@ 
     private function resolveWeakReference(
         \Spiral\Core\Config\WeakReference $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): ?object {
         $avoidCache = $arguments !== [];
 
-        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)){
+            try{
                 $this->tracer->push(false, alias: $alias, source: WeakReference::class, context: $context);
 
                 $object = $this->createInstance(
                     new Ctx(alias: $alias, class: $alias, context: $context),
                     $arguments,
                 );
-                if ($avoidCache) {
+                if ($avoidCache){
                     return $object;
                 }
                 $binding->reference = WeakReference::create($object);
-            } catch (\Throwable) {
+            }catch (\Throwable){
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -273,7 +273,7 @@ 
                         )
                     )
                 );
-            } finally {
+            }finally{
                 $this->tracer->pop();
             }
         }
@@ -284,22 +284,22 @@ 
     private function resolveWithoutBinding(
         string $alias,
         array $parameters = [],
-        Stringable|string|null $context = null
+        Stringable | string | null $context = null
     ): mixed {
         $parent = $this->scope->getParent();
 
-        if ($parent !== null) {
-            try {
+        if ($parent !== null){
+            try{
                 $this->tracer->push(false, ...[
                     'current scope' => $this->scope->getScopeName(),
                     'jump to parent scope' => $this->scope->getParentScope()->getScopeName(),
                 ]);
                 return $parent->make($alias, $parameters, $context);
-            } catch (BadScopeException $e) {
-                if ($this->scope->getScopeName() !== $e->getScope()) {
+            }catch (BadScopeException $e){
+                if ($this->scope->getScopeName() !== $e->getScope()){
                     throw $e;
                 }
-            } catch (ContainerExceptionInterface $e) {
+            }catch (ContainerExceptionInterface $e){
                 $className = match (true) {
                     $e instanceof NotFoundException => NotFoundException::class,
                     default => ContainerException::class,
@@ -308,19 +308,19 @@ 
                     'Can\'t resolve `%s`.',
                     $alias,
                 )), previous: $e);
-            } finally {
+            }finally{
                 $this->tracer->pop(false);
             }
         }
 
         $this->tracer->push(false, action: 'autowire', alias: $alias, context: $context);
-        try {
+        try{
             //No direct instructions how to construct class, make is automatically
             return $this->autowire(
                 new Ctx(alias: $alias, class: $alias, context: $context),
                 $parameters,
             );
-        } finally {
+        }finally{
             $this->tracer->pop(false);
         }
     }
@@ -341,7 +341,7 @@ 
                 &&
                 (isset($this->state->injectors[$ctx->class]) || $this->binder->hasInjector($ctx->class))
         ))
-        ) {
+        ){
             throw new NotFoundException($this->tracer->combineTraceMessage(\sprintf(
                 'Can\'t resolve `%s`: undefined class or binding `%s`.',
                 $this->tracer->getRootAlias(),
@@ -370,7 +370,7 @@ 
         // Check scope name
         $ctx->reflection = new \ReflectionClass($instance);
         $scopeName = ($ctx->reflection->getAttributes(ScopeAttribute::class)[0] ?? null)?->newInstance()->name;
-        if ($scopeName !== null && $scopeName !== $this->scope->getScopeName()) {
+        if ($scopeName !== null && $scopeName !== $this->scope->getScopeName()){
             throw new BadScopeException($scopeName, $instance::class);
         }
 
@@ -397,24 +397,24 @@ 
         array $arguments,
     ): object {
         $class = $ctx->class;
-        try {
+        try{
             $ctx->reflection = $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         // Check scope name
         $scope = ($reflection->getAttributes(ScopeAttribute::class)[0] ?? null)?->newInstance()->name;
-        if ($scope !== null && $scope !== $this->scope->getScopeName()) {
+        if ($scope !== null && $scope !== $this->scope->getScopeName()){
             throw new BadScopeException($scope, $class);
         }
 
         // We have to construct class using external injector when we know the exact context
-        if ($arguments === [] && $this->binder->hasInjector($class)) {
+        if ($arguments === [] && $this->binder->hasInjector($class)){
             return $this->resolveInjector($this->state->bindings[$ctx->class], $ctx, $arguments);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -427,12 +427,12 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null){
+            try{
                 $this->tracer->push(false, action: 'resolve arguments', signature: $constructor);
                 $this->tracer->push(true);
                 $args = $this->resolver->resolveArguments($constructor, $arguments);
-            } catch (ValidationException $e) {
+            }catch (ValidationException $e){
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -442,22 +442,22 @@ 
                         )
                     ),
                 );
-            } finally {
+            }finally{
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-            try {
+            try{
                 // Using constructor with resolved arguments
                 $this->tracer->push(false, call: "$class::__construct", arguments: $args);
                 $this->tracer->push(true);
                 $instance = new $class(...$args);
-            } catch (\TypeError $e) {
+            }catch (\TypeError $e){
                 throw new WrongTypeException($constructor, $e);
-            } finally {
+            }finally{
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-        } else {
+        }else{
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -475,13 +475,13 @@ 
         $instance = $this->runInflector($instance);
 
         //Declarative singletons
-        if ($this->isSingleton($ctx)) {
+        if ($this->isSingleton($ctx)){
             $this->state->singletons[$ctx->alias] = $instance;
         }
 
         // Register finalizer
         $finalizer = $this->getFinalizer($ctx, $instance);
-        if ($finalizer !== null) {
+        if ($finalizer !== null){
             $this->state->finalizers[] = $finalizer;
         }
 
@@ -493,12 +493,12 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if ($ctx->singleton === true) {
+        if ($ctx->singleton === true){
             return true;
         }
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class)){
             return true;
         }
 
@@ -512,7 +512,7 @@ 
          * @var Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 
@@ -526,10 +526,10 @@ 
     {
         $scope = $this->scope;
 
-        while ($scope !== null) {
-            foreach ($this->state->inflectors as $class => $inflectors) {
-                if ($instance instanceof $class) {
-                    foreach ($inflectors as $inflector) {
+        while ($scope !== null){
+            foreach ($this->state->inflectors as $class => $inflectors){
+                if ($instance instanceof $class){
+                    foreach ($inflectors as $inflector){
                         $instance = $inflector->getParametersCount() > 1
                             ? $this->invoker->invoke($inflector->inflector, [$instance])
                             : ($inflector->inflector)($instance);
@@ -545,9 +545,9 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try{
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
 

Braces +119 added lines, -51 removed lines

@@ -68,17 +68,20 @@ 
      */
     public function make(string $alias, array $parameters = [], Stringable|string|null $context = null): mixed
     {
-        if ($parameters === [] && \array_key_exists($alias, $this->state->singletons)) {
+        if ($parameters === [] && \array_key_exists($alias, $this->state->singletons))
+        {
             return $this->state->singletons[$alias];
         }
 
         $binding = $this->state->bindings[$alias] ?? null;
 
-        if ($binding === null) {
+        if ($binding === null)
+        {
             return $this->resolveWithoutBinding($alias, $parameters, $context);
         }
 
-        try {
+        try
+        {
             $this->tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -106,7 +109,9 @@ 
                     ->resolveWeakReference($binding, $alias, $context, $parameters),
                 default => $binding,
             };
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$alias] ??= $binding;
             $this->tracer->pop(true);
             $this->tracer->pop(false);
@@ -120,18 +125,23 @@ 
     private function resolveInjector(Injectable $binding, Ctx $ctx, array $arguments)
     {
         $context = $ctx->context;
-        try {
+        try
+        {
             $reflection = $ctx->reflection ??= new \ReflectionClass($ctx->class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         $injector = $binding->injector;
 
-        try {
+        try
+        {
             $injectorInstance = \is_object($injector) ? $injector : $this->container->get($injector);
 
-            if (!$injectorInstance instanceof InjectorInterface) {
+            if (!$injectorInstance instanceof InjectorInterface)
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Class '%s' must be an instance of InjectorInterface for '%s'.",
@@ -158,7 +168,8 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -168,7 +179,9 @@ 
             }
 
             return $instance;
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -187,7 +200,8 @@ 
             //Binding is pointing to something else
             : $this->make($binding->alias, $arguments, $context);
 
-        if ($binding->singleton && $arguments === []) {
+        if ($binding->singleton && $arguments === [])
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -228,11 +242,14 @@ 
         array $arguments,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton);
-        try {
+        try
+        {
             $instance = $binding::class === \Spiral\Core\Config\Factory::class && $binding->getParametersCount() === 0
                 ? ($binding->factory)()
                 : $this->invoker->invoke($binding->factory, $arguments);
-        } catch (NotCallableException $e) {
+        }
+        catch (NotCallableException $e)
+        {
             throw new ContainerException(
                 $this->tracer->combineTraceMessage(\sprintf('Invalid binding for `%s`.', $ctx->alias)),
                 $e->getCode(),
@@ -251,19 +268,24 @@ 
     ): ?object {
         $avoidCache = $arguments !== [];
 
-        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias))
+        {
+            try
+            {
                 $this->tracer->push(false, alias: $alias, source: WeakReference::class, context: $context);
 
                 $object = $this->createInstance(
                     new Ctx(alias: $alias, class: $alias, context: $context),
                     $arguments,
                 );
-                if ($avoidCache) {
+                if ($avoidCache)
+                {
                     return $object;
                 }
                 $binding->reference = WeakReference::create($object);
-            } catch (\Throwable) {
+            }
+            catch (\Throwable)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -273,7 +295,9 @@ 
                         )
                     )
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop();
             }
         }
@@ -288,18 +312,25 @@ 
     ): mixed {
         $parent = $this->scope->getParent();
 
-        if ($parent !== null) {
-            try {
+        if ($parent !== null)
+        {
+            try
+            {
                 $this->tracer->push(false, ...[
                     'current scope' => $this->scope->getScopeName(),
                     'jump to parent scope' => $this->scope->getParentScope()->getScopeName(),
                 ]);
                 return $parent->make($alias, $parameters, $context);
-            } catch (BadScopeException $e) {
-                if ($this->scope->getScopeName() !== $e->getScope()) {
+            }
+            catch (BadScopeException $e)
+            {
+                if ($this->scope->getScopeName() !== $e->getScope())
+                {
                     throw $e;
                 }
-            } catch (ContainerExceptionInterface $e) {
+            }
+            catch (ContainerExceptionInterface $e)
+            {
                 $className = match (true) {
                     $e instanceof NotFoundException => NotFoundException::class,
                     default => ContainerException::class,
@@ -308,19 +339,24 @@ 
                     'Can\'t resolve `%s`.',
                     $alias,
                 )), previous: $e);
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(false);
             }
         }
 
         $this->tracer->push(false, action: 'autowire', alias: $alias, context: $context);
-        try {
+        try
+        {
             //No direct instructions how to construct class, make is automatically
             return $this->autowire(
                 new Ctx(alias: $alias, class: $alias, context: $context),
                 $parameters,
             );
-        } finally {
+        }
+        finally
+        {
             $this->tracer->pop(false);
         }
     }
@@ -370,7 +406,8 @@ 
         // Check scope name
         $ctx->reflection = new \ReflectionClass($instance);
         $scopeName = ($ctx->reflection->getAttributes(ScopeAttribute::class)[0] ?? null)?->newInstance()->name;
-        if ($scopeName !== null && $scopeName !== $this->scope->getScopeName()) {
+        if ($scopeName !== null && $scopeName !== $this->scope->getScopeName())
+        {
             throw new BadScopeException($scopeName, $instance::class);
         }
 
@@ -397,24 +434,30 @@ 
         array $arguments,
     ): object {
         $class = $ctx->class;
-        try {
+        try
+        {
             $ctx->reflection = $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         // Check scope name
         $scope = ($reflection->getAttributes(ScopeAttribute::class)[0] ?? null)?->newInstance()->name;
-        if ($scope !== null && $scope !== $this->scope->getScopeName()) {
+        if ($scope !== null && $scope !== $this->scope->getScopeName())
+        {
             throw new BadScopeException($scope, $class);
         }
 
         // We have to construct class using external injector when we know the exact context
-        if ($arguments === [] && $this->binder->hasInjector($class)) {
+        if ($arguments === [] && $this->binder->hasInjector($class))
+        {
             return $this->resolveInjector($this->state->bindings[$ctx->class], $ctx, $arguments);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -427,12 +470,16 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 $this->tracer->push(false, action: 'resolve arguments', signature: $constructor);
                 $this->tracer->push(true);
                 $args = $this->resolver->resolveArguments($constructor, $arguments);
-            } catch (ValidationException $e) {
+            }
+            catch (ValidationException $e)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -442,22 +489,31 @@ 
                         )
                     ),
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-            try {
+            try
+            {
                 // Using constructor with resolved arguments
                 $this->tracer->push(false, call: "$class::__construct", arguments: $args);
                 $this->tracer->push(true);
                 $instance = new $class(...$args);
-            } catch (\TypeError $e) {
+            }
+            catch (\TypeError $e)
+            {
                 throw new WrongTypeException($constructor, $e);
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -475,13 +531,15 @@ 
         $instance = $this->runInflector($instance);
 
         //Declarative singletons
-        if ($this->isSingleton($ctx)) {
+        if ($this->isSingleton($ctx))
+        {
             $this->state->singletons[$ctx->alias] = $instance;
         }
 
         // Register finalizer
         $finalizer = $this->getFinalizer($ctx, $instance);
-        if ($finalizer !== null) {
+        if ($finalizer !== null)
+        {
             $this->state->finalizers[] = $finalizer;
         }
 
@@ -493,12 +551,14 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if ($ctx->singleton === true) {
+        if ($ctx->singleton === true)
+        {
             return true;
         }
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class))
+        {
             return true;
         }
 
@@ -512,7 +572,8 @@ 
          * @var Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -526,10 +587,14 @@ 
     {
         $scope = $this->scope;
 
-        while ($scope !== null) {
-            foreach ($this->state->inflectors as $class => $inflectors) {
-                if ($instance instanceof $class) {
-                    foreach ($inflectors as $inflector) {
+        while ($scope !== null)
+        {
+            foreach ($this->state->inflectors as $class => $inflectors)
+            {
+                if ($instance instanceof $class)
+                {
+                    foreach ($inflectors as $inflector)
+                    {
                         $instance = $inflector->getParametersCount() > 1
                             ? $this->invoker->invoke($inflector->inflector, [$instance])
                             : ($inflector->inflector)($instance);
@@ -545,9 +610,12 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try
+        {
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             return false;
         }
 

src/Core/tests/Scope/ProxyTest.php

Spacing +14 added lines, -14 removed lines

@@ -42,7 +42,7 @@ 
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++){
                         // because of proxy
                         self::assertNotInstanceOf(KVLogger::class, $carrier->getLogger());
                         self::assertSame('kv', $carrier->logger->getName());
@@ -62,7 +62,7 @@ 
                     // from the current `foo` scope
                     self::assertInstanceOf(FileLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++){
                         // because of proxy
                         self::assertNotInstanceOf(FileLogger::class, $carrier->getLogger());
                         self::assertSame('file', $carrier->logger->getName());
@@ -79,14 +79,14 @@ 
         $root = new Container();
         $root->getBinder('http')->bindSingleton(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1){
             $c1->runScope(
                 new Scope(name: 'http'),
                 static function (
                     ScopedProxyLoggerCarrier $carrier,
                     ScopedProxyLoggerCarrier $carrier2,
                     LoggerInterface $logger
-                ) {
+                ){
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
@@ -106,10 +106,10 @@ 
         $root = new Container();
         $root->getBinder('foo')->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1){
             $c1->runScope(
                 new Scope(name: 'foo'),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger){
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
@@ -130,7 +130,7 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface{
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -139,8 +139,8 @@ 
                 )
             );
 
-        $root->runScope(new Scope(), static function (Container $c1) {
-            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param) {
+        $root->runScope(new Scope(), static function (Container $c1){
+            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param){
                 self::assertInstanceOf(ReflectionParameter::class, $param->value);
                 self::assertSame('param', $param->value->getName());
 
@@ -171,7 +171,7 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface{
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -181,15 +181,15 @@ 
             );
 
         FiberHelper::runFiberSequence(
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx){
+                for ($i = 0; $i < 10; $i++){
                     self::assertInstanceOf(ReflectionParameter::class, $ctx->getValue(), 'Context injected');
                     self::assertSame('ctx', $ctx->getValue()->getName());
                     \Fiber::suspend();
                 }
             }),
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context){
+                for ($i = 0; $i < 10; $i++){
                     self::assertInstanceOf(ReflectionParameter::class, $context->getValue(), 'Context injected');
                     self::assertSame('context', $context->getValue()->getName());
                     \Fiber::suspend();

Braces +34 added lines, -17 removed lines

@@ -38,11 +38,13 @@ 
                         LoggerInterface::class => KVLogger::class,
                     ],
                 ),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc)
+                {
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++)
+                    {
                         // because of proxy
                         self::assertNotInstanceOf(KVLogger::class, $carrier->getLogger());
                         self::assertSame('kv', $carrier->logger->getName());
@@ -58,11 +60,13 @@ 
                         LoggerInterface::class => FileLogger::class,
                     ],
                 ),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc)
+                {
                     // from the current `foo` scope
                     self::assertInstanceOf(FileLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++)
+                    {
                         // because of proxy
                         self::assertNotInstanceOf(FileLogger::class, $carrier->getLogger());
                         self::assertSame('file', $carrier->logger->getName());
@@ -79,7 +83,8 @@ 
         $root = new Container();
         $root->getBinder('http')->bindSingleton(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
             $c1->runScope(
                 new Scope(name: 'http'),
                 static function (
@@ -106,10 +111,12 @@ 
         $root = new Container();
         $root->getBinder('foo')->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
             $c1->runScope(
                 new Scope(name: 'foo'),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger)
+                {
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
@@ -130,7 +137,8 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface
+                    {
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -139,8 +147,10 @@ 
                 )
             );
 
-        $root->runScope(new Scope(), static function (Container $c1) {
-            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
+            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param)
+            {
                 self::assertInstanceOf(ReflectionParameter::class, $param->value);
                 self::assertSame('param', $param->value->getName());
 
@@ -171,7 +181,8 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface
+                    {
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -181,15 +192,19 @@ 
             );
 
         FiberHelper::runFiberSequence(
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx)
+            {
+                for ($i = 0; $i < 10; $i++)
+                {
                     self::assertInstanceOf(ReflectionParameter::class, $ctx->getValue(), 'Context injected');
                     self::assertSame('ctx', $ctx->getValue()->getName());
                     \Fiber::suspend();
                 }
             }),
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context)
+            {
+                for ($i = 0; $i < 10; $i++)
+                {
                     self::assertInstanceOf(ReflectionParameter::class, $context->getValue(), 'Context injected');
                     self::assertSame('context', $context->getValue()->getName());
                     \Fiber::suspend();
@@ -203,8 +218,10 @@ 
         $root = new Container();
         $root->getBinder('http')->bindSingleton(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (#[Proxy] ContainerInterface $cp) use ($root) {
-            $root->runScope(new Scope(name: 'http'), static function (ContainerInterface $c) use ($cp) {
+        $root->runScope(new Scope(), static function (#[Proxy] ContainerInterface $cp) use ($root)
+        {
+            $root->runScope(new Scope(name: 'http'), static function (ContainerInterface $c) use ($cp)
+            {
                 self::assertNotSame($c, $cp);
                 self::assertSame($c, $cp->get(ContainerInterface::class));
                 self::assertInstanceOf(KVLogger::class, $cp->get(LoggerInterface::class));

src/Core/tests/Scope/SideEffectTest.php

Spacing +3 added lines, -3 removed lines

@@ -23,10 +23,10 @@ 
         $root = new Container();
         $root->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1){
             $c1->bind(LoggerInterface::class, FileLogger::class);
 
-            $c1->runScope(new Scope(), static function (LoggerCarrier $carrier, LoggerInterface $logger) {
+            $c1->runScope(new Scope(), static function (LoggerCarrier $carrier, LoggerInterface $logger){
                 // from the $root container
                 self::assertInstanceOf(KVLogger::class, $carrier->logger);
                 // from the $c1 container
@@ -40,7 +40,7 @@ 
         $root = new Container();
         $root->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1){
             $c1->bind(LoggerInterface::class, FileLogger::class);
 
             self::assertInstanceOf(

Braces +6 added lines, -3 removed lines

@@ -23,10 +23,12 @@ 
         $root = new Container();
         $root->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
             $c1->bind(LoggerInterface::class, FileLogger::class);
 
-            $c1->runScope(new Scope(), static function (LoggerCarrier $carrier, LoggerInterface $logger) {
+            $c1->runScope(new Scope(), static function (LoggerCarrier $carrier, LoggerInterface $logger)
+            {
                 // from the $root container
                 self::assertInstanceOf(KVLogger::class, $carrier->logger);
                 // from the $c1 container
@@ -40,7 +42,8 @@ 
         $root = new Container();
         $root->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
             $c1->bind(LoggerInterface::class, FileLogger::class);
 
             self::assertInstanceOf(

src/Core/src/Internal/Proxy/ProxyClassRenderer.php

Spacing +19 added lines, -19 removed lines

@@ -11,33 +11,33 @@ 
 {
     public static function renderClass(\ReflectionClass $type, $className): string
     {
-        if (\str_contains($className, '\\')) {
+        if (\str_contains($className, '\\')){
             $classShortName = \substr($className, \strrpos($className, '\\') + 1);
-            $classNamespaceStr = 'namespace ' . \substr($className, 0, \strrpos($className, '\\')) . ';';
-        } else {
+            $classNamespaceStr = 'namespace '.\substr($className, 0, \strrpos($className, '\\')).';';
+        }else{
             $classShortName = $className;
             $classNamespaceStr = '';
         }
 
         $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}',
@@ -49,7 +49,7 @@ 
 
             $argsStr = \implode(', ', $args);
 
-            if ($method->isVariadic()) {
+            if ($method->isVariadic()){
                 $classBody[] = self::renderMethod($method, <<<PHP
                     {$return}\\Spiral\\Core\\Internal\\Proxy\\Resolver::resolve(
                         '{$interface}',
@@ -88,7 +88,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,
         );
@@ -101,15 +101,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));
         }
@@ -121,7 +121,7 @@ 
         };
 
         $result = [];
-        foreach ($types as $type) {
+        foreach ($types as $type){
             $result[] = $type->isBuiltin()
                 ? $type->getName()
                 : self::normalizeClassType($type, $class);
@@ -132,12 +132,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);
@@ -149,7 +149,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 +21 added lines, -10 removed lines

@@ -11,18 +11,23 @@ 
 {
     public static function renderClass(\ReflectionClass $type, $className): string
     {
-        if (\str_contains($className, '\\')) {
+        if (\str_contains($className, '\\'))
+        {
             $classShortName = \substr($className, \strrpos($className, '\\') + 1);
             $classNamespaceStr = 'namespace ' . \substr($className, 0, \strrpos($className, '\\')) . ';';
-        } else {
+        }
+        else
+        {
             $classShortName = $className;
             $classNamespaceStr = '';
         }
 
         $interface = $type->getName();
         $classBody = [];
-        foreach ($type->getMethods() as $method) {
-            if ($method->isConstructor()) {
+        foreach ($type->getMethods() as $method)
+        {
+            if ($method->isConstructor())
+            {
                 continue;
             }
 
@@ -32,12 +37,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}',
@@ -49,7 +56,8 @@ 
 
             $argsStr = \implode(', ', $args);
 
-            if ($method->isVariadic()) {
+            if ($method->isVariadic())
+            {
                 $classBody[] = self::renderMethod($method, <<<PHP
                     {$return}\\Spiral\\Core\\Internal\\Proxy\\Resolver::resolve(
                         '{$interface}',
@@ -108,7 +116,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));
@@ -121,7 +130,8 @@ 
         };
 
         $result = [];
-        foreach ($types as $type) {
+        foreach ($types as $type)
+        {
             $result[] = $type->isBuiltin()
                 ? $type->getName()
                 : self::normalizeClassType($type, $class);
@@ -132,7 +142,8 @@ 
 
     public static function renderDefaultValue(\ReflectionParameter $param): string
     {
-        if ($param->isDefaultValueConstant()) {
+        if ($param->isDefaultValueConstant())
+        {
             $result = $param->getDefaultValueConstantName();
 
             return \explode('::', $result)[0] === 'self'