spiral / framework

src/Core/tests/InjectableTest.php

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
 
     public function testInvalidInjector(): void
     {
-        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an " .
+        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an ".
                     "instance of InjectorInterface for 'Spiral\Tests\Core\Fixtures\TestConfig'";
         $this->expectException(InjectionException::class);
         $this->expectExceptionMessage($excepted);
@@ -65,7 +65,7 @@ 
 
     public function testInvalidRuntimeInjector(): void
     {
-        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an " .
+        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an ".
             "instance of InjectorInterface for 'Spiral\Tests\Core\Fixtures\TestConfig'";
         $this->expectException(InjectionException::class);
         $this->expectExceptionMessage($excepted);
@@ -102,7 +102,7 @@ 
         $container->bind(ConfigsInterface::class, $configurator);
 
         $configurator->shouldReceive('createInjection')
-            ->with(m::on(static function (ReflectionClass $r) {
+            ->with(m::on(static function (ReflectionClass $r){
                 return $r->getName() === TestConfig::class;
             }), null)
             ->andReturn($expected);
@@ -119,7 +119,7 @@ 
         $container->bind(ConfigsInterface::class, $configurator);
 
         $configurator->shouldReceive('createInjection')
-            ->with(m::on(static function (ReflectionClass $r) {
+            ->with(m::on(static function (ReflectionClass $r){
                 return $r->getName() === TestConfig::class;
             }), 'context')
             ->andReturn($expected);
@@ -207,8 +207,8 @@ 
     public function testExtendedInjectorAnonClassObjectParam(): void
     {
         $container = new Container();
-        $container->bind(stdClass::class, new Injectable(new class implements Container\InjectorInterface {
-            public function createInjection(\ReflectionClass $class, object|string|null $context = null): object
+        $container->bind(stdClass::class, new Injectable(new class implements Container\InjectorInterface{
+            public function createInjection(\ReflectionClass $class, object | string | null $context = null): object
             {
                 return (object)['context' => $context];
             }
@@ -223,7 +223,7 @@ 
     public function testExtendedInjectorAnonClassMixedParam(): void
     {
         $container = new Container();
-        $container->bind(stdClass::class, new Injectable(new class implements Container\InjectorInterface {
+        $container->bind(stdClass::class, new Injectable(new class implements Container\InjectorInterface{
             public function createInjection(\ReflectionClass $class, mixed $context = null): object
             {
                 return (object)['context' => $context];

src/Core/tests/Fixtures/ExtendedContextInjector.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
  */
 class ExtendedContextInjector implements InjectorInterface
 {
-    public function createInjection(\ReflectionClass $class, \ReflectionParameter|string|null $context = null): object
+    public function createInjection(\ReflectionClass $class, \ReflectionParameter | string | null $context = null): object
     {
         return (object)['context' => $context];
     }

src/Core/src/Internal/Container.php

Spacing +3 added lines, -3 removed lines

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

Braces +2 added lines, -1 removed lines

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

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);
@@ -116,18 +116,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'.",
@@ -155,7 +155,7 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance)){
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -165,7 +165,7 @@ 
             }
 
             return $instance;
-        } finally {
+        }finally{
             $this->state->bindings[$reflection->getName()] ??= $binding;
         }
     }
@@ -173,18 +173,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;
         }
 
@@ -194,13 +194,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;
@@ -209,7 +209,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);
@@ -219,17 +219,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(),
@@ -243,24 +243,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(
@@ -270,7 +270,7 @@ 
                         )
                     )
                 );
-            } finally {
+            }finally{
                 $this->tracer->pop();
             }
         }
@@ -281,22 +281,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,
@@ -305,19 +305,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);
         }
     }
@@ -338,7 +338,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(),
@@ -367,7 +367,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);
         }
 
@@ -394,24 +394,24 @@ 
         array $parameters,
     ): 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 exact context
-        if ($this->binder->hasInjector($class)) {
+        if ($this->binder->hasInjector($class)){
             return $this->resolveInjector($this->state->bindings[$ctx->class], $ctx, $parameters);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -424,12 +424,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);
                 $arguments = $this->resolver->resolveArguments($constructor, $parameters);
-            } catch (ValidationException $e) {
+            }catch (ValidationException $e){
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -439,22 +439,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: $arguments);
                 $this->tracer->push(true);
                 $instance = new $class(...$arguments);
-            } 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();
         }
@@ -472,13 +472,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;
         }
 
@@ -490,12 +490,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;
         }
 
@@ -509,7 +509,7 @@ 
          * @var Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 
@@ -523,10 +523,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);
@@ -542,9 +542,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);
@@ -116,18 +121,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'.",
@@ -155,7 +165,8 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -165,7 +176,9 @@ 
             }
 
             return $instance;
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$reflection->getName()] ??= $binding;
         }
     }
@@ -184,7 +197,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;
         }
 
@@ -225,11 +239,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(),
@@ -248,19 +265,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(
@@ -270,7 +292,9 @@ 
                         )
                     )
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop();
             }
         }
@@ -285,18 +309,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,
@@ -305,19 +336,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);
         }
     }
@@ -367,7 +403,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);
         }
 
@@ -394,24 +431,30 @@ 
         array $parameters,
     ): 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 exact context
-        if ($this->binder->hasInjector($class)) {
+        if ($this->binder->hasInjector($class))
+        {
             return $this->resolveInjector($this->state->bindings[$ctx->class], $ctx, $parameters);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -424,12 +467,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);
                 $arguments = $this->resolver->resolveArguments($constructor, $parameters);
-            } catch (ValidationException $e) {
+            }
+            catch (ValidationException $e)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -439,22 +486,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: $arguments);
                 $this->tracer->push(true);
                 $instance = new $class(...$arguments);
-            } 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();
         }
@@ -472,13 +528,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;
         }
 
@@ -490,12 +548,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;
         }
 
@@ -509,7 +569,8 @@ 
          * @var Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -523,10 +584,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);
@@ -542,9 +607,12 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try
+        {
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             return false;
         }
 

src/Core/src/Internal/Factory/Ctx.php

Spacing +2 added lines, -2 removed lines

@@ -17,9 +17,9 @@
     public function __construct(
         public readonly string $alias,
         public string $class,
-        public \Stringable|string|null $context = null,
+        public \Stringable | string | null $context = null,
         public ?bool $singleton = null,
         public ?\ReflectionClass $reflection = null,
-    ) {
+    ){
     }
 }

src/Core/tests/Internal/Proxy/ProxyClassRendererTest.php

Spacing +12 added lines, -12 removed lines

@@ -34,24 +34,24 @@ 
         yield [$from(fn(string $string = self::STRING_CONST) => 0), 'string $string = self::STRING_CONST'];
         yield [
             $from(fn(string $string = ProxyClassRendererTest::STRING_CONST) => 0),
-            'string $string = \\' . self::class . '::STRING_CONST',
+            'string $string = \\'.self::class.'::STRING_CONST',
         ];
-        yield [$from(fn(string|int $string = self::INT_CONST) => 0), 'string|int $string = self::INT_CONST'];
+        yield [$from(fn(string | int $string = self::INT_CONST) => 0), 'string|int $string = self::INT_CONST'];
         yield [$from(fn(mixed $string = 42) => 0), 'mixed $string = 42'];
         yield [$from(fn(int $string = 42) => 0), 'int $string = 42'];
         yield [$from(fn(float $string = 42) => 0), 'float $string = 42.0'];
         yield [$from(fn(?bool $string = false) => 0), '?bool $string = false'];
-        yield [$from(fn(bool|null $string = true) => 0), '?bool $string = true'];
+        yield [$from(fn(bool | null $string = true) => 0), '?bool $string = true'];
         yield [$from(fn(object $string = null) => 0), '?object $string = NULL'];
         yield [$from(fn(iterable $string = null) => 0), '?iterable $string = NULL'];
         yield [$from(fn(Countable&ArrayAccess $val) => 0), '\Countable&\ArrayAccess $val'];
         yield [$from(fn(string ...$val) => 0), 'string ...$val'];
-        yield [$from(fn(string|int ...$val) => 0), 'string|int ...$val'];
-        yield [$from(fn(string|int &$link) => 0), 'string|int &$link'];
+        yield [$from(fn(string | int ...$val) => 0), 'string|int ...$val'];
+        yield [$from(fn(string | int &$link) => 0), 'string|int &$link'];
         yield [$from(self::withSelf(...)), \sprintf('\%s $self = new self()', self::class)];
         yield [$from(fn(object $link = new \stdClass()) => 0), 'object $link = new \stdClass()'];
         yield [
-            $from(fn(#[Proxy] float|int|\stdClass|null $string = new \stdClass(1, 2, bar: "\n'zero")) => 0),
+            $from(fn(#[Proxy] float | int | \stdClass | null $string = new \stdClass(1, 2, bar: "\n'zero")) => 0),
             "\stdClass|int|float|null \$string = new \stdClass(1, 2, bar: '\n\'zero')",
         ];
         yield [
@@ -76,18 +76,18 @@ 
             public const INT_CONST = 42;
 
             #[ExpectedAttribute('public function test1(...$variadic)')]
-            public function test1(...$variadic) {}
+            public function test1(...$variadic){}
             #[ExpectedAttribute('public function test2(string|int $string = self::INT_CONST): string|int')]
-            public function test2(string|int $string = self::INT_CONST): string|int {}
+            public function test2(string | int $string = self::INT_CONST): string | int {}
             #[ExpectedAttribute('public function test3(object $obj = new \stdClass(new \stdClass(), new \stdClass()))')]
-            public function test3(object $obj = new stdClass(new stdClass(), new stdClass())) {}
-            #[ExpectedAttribute('public function test4(): \\' . ProxyClassRendererTest::class)]
+            public function test3(object $obj = new stdClass(new stdClass(), new stdClass())){}
+            #[ExpectedAttribute('public function test4(): \\'.ProxyClassRendererTest::class)]
             public function test4(): ProxyClassRendererTest {}
             #[ExpectedAttribute('public function &test5(): string')]
             public function &test5(): string {}
         };
 
-        foreach ((new \ReflectionClass($class))->getMethods() as $method) {
+        foreach ((new \ReflectionClass($class))->getMethods() as $method){
             $expected = $method->getAttributes(ExpectedAttribute::class)[0]->newInstance();
 
             yield [$method, $expected->value];
@@ -117,6 +117,6 @@ 
 {
     public function __construct(
         public readonly string $value,
-    ) {
+    ){
     }
 }

Braces +10 added lines, -4 removed lines

@@ -72,22 +72,28 @@
 
     public static function provideRenderMethod(): iterable
     {
-        $class = new class {
+        $class = new class
+        {
             public const INT_CONST = 42;
 
             #[ExpectedAttribute('public function test1(...$variadic)')]
-            public function test1(...$variadic) {}
+            public function test1(...$variadic)
+            {
+}
             #[ExpectedAttribute('public function test2(string|int $string = self::INT_CONST): string|int')]
             public function test2(string|int $string = self::INT_CONST): string|int {}
             #[ExpectedAttribute('public function test3(object $obj = new \stdClass(new \stdClass(), new \stdClass()))')]
-            public function test3(object $obj = new stdClass(new stdClass(), new stdClass())) {}
+            public function test3(object $obj = new stdClass(new stdClass(), new stdClass()))
+            {
+}
             #[ExpectedAttribute('public function test4(): \\' . ProxyClassRendererTest::class)]
             public function test4(): ProxyClassRendererTest {}
             #[ExpectedAttribute('public function &test5(): string')]
             public function &test5(): string {}
         };
 
-        foreach ((new \ReflectionClass($class))->getMethods() as $method) {
+        foreach ((new \ReflectionClass($class))->getMethods() as $method)
+        {
             $expected = $method->getAttributes(ExpectedAttribute::class)[0]->newInstance();
 
             yield [$method, $expected->value];

src/Core/tests/Internal/Proxy/ProxyTest.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
             $proxy = $$var;
             self::assertSame(['foo', 'bar', 'baz', 69], $proxy->extraVariadic('foo', 'bar', 'baz', 69));
             self::assertSame(
-                ['foo' => 'foo','zap' => 'bar', 'gas' => 69],
+                ['foo' => 'foo', 'zap' => 'bar', 'gas' => 69],
                 $proxy->extraVariadic(foo: 'foo', zap: 'bar', gas: 69),
             );
         });

Braces +12 added lines, -6 removed lines

@@ -28,7 +28,8 @@ 
         $root->bindSingleton(MockInterface::class, Stub\MockInterfaceImpl::class);
         $root->bindSingleton(EmptyInterface::class, Stub\MockInterfaceImpl::class);
 
-        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var) {
+        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var)
+        {
             /** @var MockInterfaceImpl $proxy */
             $proxy = $$var;
             $proxy->bar(name: 'foo'); // Possible to run
@@ -47,7 +48,8 @@ 
         $root->bindSingleton(MockInterface::class, Stub\MockInterfaceImpl::class);
         $root->bindSingleton(EmptyInterface::class, Stub\MockInterfaceImpl::class);
 
-        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var) {
+        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var)
+        {
             /** @var MockInterfaceImpl $proxy */
             $proxy = $$var;
             self::assertSame(['foo', 'bar', 'baz', 69], $proxy->extra('foo', 'bar', 'baz', 69));
@@ -66,7 +68,8 @@ 
         $root->bindSingleton(MockInterface::class, Stub\MockInterfaceImpl::class);
         $root->bindSingleton(EmptyInterface::class, Stub\MockInterfaceImpl::class);
 
-        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var) {
+        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var)
+        {
             /** @var MockInterfaceImpl $proxy */
             $proxy = $$var;
             self::assertSame(['foo', 'bar', 'baz', 69], $proxy->extraVariadic('foo', 'bar', 'baz', 69));
@@ -90,7 +93,8 @@ 
         $root->bindSingleton(MockInterface::class, Stub\MockInterfaceImpl::class);
         $root->bindSingleton(EmptyInterface::class, Stub\MockInterfaceImpl::class);
 
-        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var) {
+        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var)
+        {
             /** @var MockInterfaceImpl $proxy */
             $proxy = $$var;
             $str = 'bar';
@@ -112,7 +116,8 @@ 
         $root->bindSingleton(MockInterface::class, Stub\MockInterfaceImpl::class);
         $root->bindSingleton(EmptyInterface::class, Stub\MockInterfaceImpl::class);
 
-        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var) {
+        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var)
+        {
             /** @var MockInterfaceImpl $proxy */
             $proxy = $$var;
 
@@ -137,7 +142,8 @@ 
         $root->bindSingleton(MockInterface::class, Stub\MockInterfaceImpl::class);
         $root->bindSingleton(EmptyInterface::class, Stub\MockInterfaceImpl::class);
 
-        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var) {
+        $root->invoke(static function (#[Proxy] MockInterface $mock, #[Proxy] EmptyInterface $empty) use ($var)
+        {
             /** @var MockInterfaceImpl $proxy */
             $proxy = $$var;
             $str1 = 'bar';

src/Core/tests/Internal/Proxy/Stub/MockInterfaceImpl.php

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
         return $name;
     }
 
-    public function qux(int|string $age = 42): string|int
+    public function qux(int | string $age = 42): string | int
     {
         return $age;
     }
@@ -37,7 +37,7 @@ 
 
     public function concat(string $prefix, string &$byLink): array
     {
-        $byLink = $prefix . $byLink;
+        $byLink = $prefix.$byLink;
         return \func_get_args();
     }
 
@@ -48,8 +48,8 @@ 
 
     public function concatMultiple(string $prefix, string &...$byLink): array
     {
-        foreach ($byLink as $k => $link) {
-            $byLink[$k] = $prefix . $link;
+        foreach ($byLink as $k => $link){
+            $byLink[$k] = $prefix.$link;
             unset($link);
         }
 

Braces +2 added lines, -1 removed lines

@@ -48,7 +48,8 @@
 
     public function concatMultiple(string $prefix, string &...$byLink): array
     {
-        foreach ($byLink as $k => $link) {
+        foreach ($byLink as $k => $link)
+        {
             $byLink[$k] = $prefix . $link;
             unset($link);
         }

src/Core/tests/Internal/Proxy/Stub/MockInterface.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
     public function baz(string $name, int $age): string;
 
-    public function qux(string|int $age = 42): string|int;
+    public function qux(string | int $age = 42): string | int;
 
     public function space(mixed $test age = 42): mixed;