spiral / framework

src/Core/src/Internal/Config/StateBinder.php

Spacing +21 added lines, -21 removed lines

@@ -32,21 +32,21 @@ 
 {
     public function __construct(
         protected readonly State $state,
-    ) {}
+    ){}
 
     /**
      * @param TResolver|object $resolver
      */
     public function bind(string $alias, mixed $resolver): void
     {
-        if ($resolver instanceof Inflector && (\interface_exists($alias) || \class_exists($alias))) {
+        if ($resolver instanceof Inflector && (\interface_exists($alias) || \class_exists($alias))){
             $this->state->inflectors[$alias][] = $resolver;
             return;
         }
 
-        try {
+        try{
             $config = $this->makeConfig($resolver, false);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw $this->invalidBindingException($alias, $e);
         }
 
@@ -58,9 +58,9 @@ 
      */
     public function bindSingleton(string $alias, mixed $resolver): void
     {
-        try {
+        try{
             $config = $this->makeConfig($resolver, true);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw $this->invalidBindingException($alias, $e);
         }
 
@@ -72,13 +72,13 @@ 
         $bindings = &$this->state->bindings;
 
         $flags = [];
-        while ($binding = $bindings[$alias] ?? null and $binding::class === Alias::class) {
+        while ($binding = $bindings[$alias] ?? null and $binding::class === Alias::class){
             //Checking alias tree
-            if ($flags[$binding->alias] ?? false) {
+            if ($flags[$binding->alias] ?? false){
                 return $binding->alias === $alias ?: throw new Exception('Circular alias detected');
             }
 
-            if (\array_key_exists($alias, $this->state->singletons)) {
+            if (\array_key_exists($alias, $this->state->singletons)){
                 return true;
             }
 
@@ -102,7 +102,7 @@ 
     public function removeInjector(string $class): void
     {
         unset($this->state->injectors[$class]);
-        if (!isset($this->state->bindings[$class]) || $this->state->bindings[$class]::class !== Injectable::class) {
+        if (!isset($this->state->bindings[$class]) || $this->state->bindings[$class]::class !== Injectable::class){
             return;
         }
         unset($this->state->bindings[$class]);
@@ -110,20 +110,20 @@ 
 
     public function hasInjector(string $class): bool
     {
-        if (\array_key_exists($class, $this->state->injectors)) {
+        if (\array_key_exists($class, $this->state->injectors)){
             return true;
         }
 
-        try {
+        try{
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         if (
             $reflection->implementsInterface(InjectableInterface::class)
             && $reflection->hasConstant('INJECTOR')
-        ) {
+        ){
             $const = $reflection->getConstant('INJECTOR');
             $this->bindInjector($class, $const);
 
@@ -131,12 +131,12 @@ 
         }
 
         // check interfaces
-        foreach ($this->state->injectors as $target => $injector) {
+        foreach ($this->state->injectors as $target => $injector){
             if (
                 (\class_exists($target, true) && $reflection->isSubclassOf($target))
                 ||
                 (\interface_exists($target, true) && $reflection->implementsInterface($target))
-            ) {
+            ){
                 $this->state->bindings[$class] = new Injectable($injector);
 
                 return true;
@@ -163,15 +163,15 @@ 
 
     private function makeConfigFromArray(array $resolver, bool $singleton): Binding
     {
-        if (\is_callable($resolver)) {
+        if (\is_callable($resolver)){
             return new Factory($resolver, $singleton);
         }
 
         // Validate lazy invokable array
-        if (!isset($resolver[0]) || !isset($resolver[1]) || !\is_string($resolver[1]) || $resolver[1] === '') {
+        if (!isset($resolver[0]) || !isset($resolver[1]) || !\is_string($resolver[1]) || $resolver[1] === ''){
             throw new InvalidArgumentException('Incompatible array declaration for resolver.');
         }
-        if ((!\is_string($resolver[0]) && !\is_object($resolver[0])) || $resolver[0] === '') {
+        if ((!\is_string($resolver[0]) && !\is_object($resolver[0])) || $resolver[0] === ''){
             throw new InvalidArgumentException('Incompatible array declaration for resolver.');
         }
 
@@ -191,13 +191,13 @@ 
 
     private function setBinding(string $alias, Binding $config): void
     {
-        if (isset($this->state->singletons[$alias])) {
+        if (isset($this->state->singletons[$alias])){
             throw new SingletonOverloadException($alias);
         }
 
         $this->state->bindings[$alias] = $config;
 
-        if ($config instanceof Injectable) {
+        if ($config instanceof Injectable){
             $this->state->injectors[$alias] = $config->injector;
         }
     }

Braces +41 added lines, -19 removed lines

@@ -32,21 +32,26 @@ 
 {
     public function __construct(
         protected readonly State $state,
-    ) {}
+    ) {
+}
 
     /**
      * @param TResolver|object $resolver
      */
     public function bind(string $alias, mixed $resolver): void
     {
-        if ($resolver instanceof Inflector && (\interface_exists($alias) || \class_exists($alias))) {
+        if ($resolver instanceof Inflector && (\interface_exists($alias) || \class_exists($alias)))
+        {
             $this->state->inflectors[$alias][] = $resolver;
             return;
         }
 
-        try {
+        try
+        {
             $config = $this->makeConfig($resolver, false);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw $this->invalidBindingException($alias, $e);
         }
 
@@ -58,9 +63,12 @@ 
      */
     public function bindSingleton(string $alias, mixed $resolver): void
     {
-        try {
+        try
+        {
             $config = $this->makeConfig($resolver, true);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw $this->invalidBindingException($alias, $e);
         }
 
@@ -72,13 +80,16 @@ 
         $bindings = &$this->state->bindings;
 
         $flags = [];
-        while ($binding = $bindings[$alias] ?? null and $binding::class === Alias::class) {
+        while ($binding = $bindings[$alias] ?? null and $binding::class === Alias::class)
+        {
             //Checking alias tree
-            if ($flags[$binding->alias] ?? false) {
+            if ($flags[$binding->alias] ?? false)
+            {
                 return $binding->alias === $alias ?: throw new Exception('Circular alias detected');
             }
 
-            if (\array_key_exists($alias, $this->state->singletons)) {
+            if (\array_key_exists($alias, $this->state->singletons))
+            {
                 return true;
             }
 
@@ -102,7 +113,8 @@ 
     public function removeInjector(string $class): void
     {
         unset($this->state->injectors[$class]);
-        if (!isset($this->state->bindings[$class]) || $this->state->bindings[$class]::class !== Injectable::class) {
+        if (!isset($this->state->bindings[$class]) || $this->state->bindings[$class]::class !== Injectable::class)
+        {
             return;
         }
         unset($this->state->bindings[$class]);
@@ -110,13 +122,17 @@ 
 
     public function hasInjector(string $class): bool
     {
-        if (\array_key_exists($class, $this->state->injectors)) {
+        if (\array_key_exists($class, $this->state->injectors))
+        {
             return true;
         }
 
-        try {
+        try
+        {
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
@@ -131,7 +147,8 @@ 
         }
 
         // check interfaces
-        foreach ($this->state->injectors as $target => $injector) {
+        foreach ($this->state->injectors as $target => $injector)
+        {
             if (
                 (\class_exists($target, true) && $reflection->isSubclassOf($target))
                 ||
@@ -163,15 +180,18 @@ 
 
     private function makeConfigFromArray(array $resolver, bool $singleton): Binding
     {
-        if (\is_callable($resolver)) {
+        if (\is_callable($resolver))
+        {
             return new Factory($resolver, $singleton);
         }
 
         // Validate lazy invokable array
-        if (!isset($resolver[0]) || !isset($resolver[1]) || !\is_string($resolver[1]) || $resolver[1] === '') {
+        if (!isset($resolver[0]) || !isset($resolver[1]) || !\is_string($resolver[1]) || $resolver[1] === '')
+        {
             throw new InvalidArgumentException('Incompatible array declaration for resolver.');
         }
-        if ((!\is_string($resolver[0]) && !\is_object($resolver[0])) || $resolver[0] === '') {
+        if ((!\is_string($resolver[0]) && !\is_object($resolver[0])) || $resolver[0] === '')
+        {
             throw new InvalidArgumentException('Incompatible array declaration for resolver.');
         }
 
@@ -191,13 +211,15 @@ 
 
     private function setBinding(string $alias, Binding $config): void
     {
-        if (isset($this->state->singletons[$alias])) {
+        if (isset($this->state->singletons[$alias]))
+        {
             throw new SingletonOverloadException($alias);
         }
 
         $this->state->bindings[$alias] = $config;
 
-        if ($config instanceof Injectable) {
+        if ($config instanceof Injectable)
+        {
             $this->state->injectors[$alias] = $config->injector;
         }
     }

src/Core/src/Container.php

Spacing +38 added lines, -38 removed lines

@@ -48,11 +48,11 @@ 
     public const DEFAULT_ROOT_SCOPE_NAME = 'root';
 
     private Internal\State $state;
-    private ResolverInterface|Internal\Resolver $resolver;
-    private FactoryInterface|Internal\Factory $factory;
-    private ContainerInterface|Internal\Container $container;
-    private BinderInterface|Internal\Binder $binder;
-    private InvokerInterface|Internal\Invoker $invoker;
+    private ResolverInterface | Internal\Resolver $resolver;
+    private FactoryInterface | Internal\Factory $factory;
+    private ContainerInterface | Internal\Container $container;
+    private BinderInterface | Internal\Binder $binder;
+    private InvokerInterface | Internal\Invoker $invoker;
     private Internal\Scope $scope;
 
     /**
@@ -60,11 +60,11 @@ 
      */
     public function __construct(
         private Config $config = new Config(),
-        string|\BackedEnum|null $scopeName = self::DEFAULT_ROOT_SCOPE_NAME,
+        string | \BackedEnum | null $scopeName = self::DEFAULT_ROOT_SCOPE_NAME,
         private Options $options = new Options(),
-    ) {
-        if (\is_object($scopeName)) {
-            $scopeName = (string) $scopeName->value;
+    ){
+        if (\is_object($scopeName)){
+            $scopeName = (string)$scopeName->value;
         }
 
         $this->initServices($this, $scopeName);
@@ -118,11 +118,11 @@ 
      * @throws \Throwable
      * @psalm-suppress TooManyArguments
      */
-    public function make(string $alias, array $parameters = [], \Stringable|string|null $context = null): mixed
+    public function make(string $alias, array $parameters = [], \Stringable | string | null $context = null): mixed
     {
         return ContainerScope::getContainer() === $this
             ? $this->factory->make($alias, $parameters, $context)
-            : ContainerScope::runScope($this, fn (): mixed => $this->factory->make($alias, $parameters, $context));
+            : ContainerScope::runScope($this, fn () : mixed => $this->factory->make($alias, $parameters, $context));
     }
 
     /**
@@ -144,7 +144,7 @@ 
      * @throws \Throwable
      * @psalm-suppress TooManyArguments
      */
-    public function get(string|Autowire $id, \Stringable|string|null $context = null): mixed
+    public function get(string | Autowire $id, \Stringable | string | null $context = null): mixed
     {
         return ContainerScope::getContainer() === $this
             ? $this->container->get($id, $context)
@@ -164,9 +164,9 @@ 
      *        If {@see string}, the default binder for the given scope will be returned. Default bindings won't affect
      *        already created Container instances except the case with the root one.
      */
-    public function getBinder(string|\BackedEnum|null $scope = null): BinderInterface
+    public function getBinder(string | \BackedEnum | null $scope = null): BinderInterface
     {
-        $scope = \is_object($scope) ? (string) $scope->value : $scope;
+        $scope = \is_object($scope) ? (string)$scope->value : $scope;
 
         return $scope === null
             ? $this->binder
@@ -176,25 +176,25 @@ 
     /**
      * @throws \Throwable
      */
-    public function runScope(Scope|array $bindings, callable $scope): mixed
+    public function runScope(Scope | array $bindings, callable $scope): mixed
     {
-        if (!\is_array($bindings)) {
+        if (!\is_array($bindings)){
             return $this->runIsolatedScope($bindings, $scope);
         }
 
         $binds = &$this->state->bindings;
         $singletons = &$this->state->singletons;
         $cleanup = $previous = $prevSin = [];
-        foreach ($bindings as $alias => $resolver) {
+        foreach ($bindings as $alias => $resolver){
             // Store previous bindings
-            if (isset($binds[$alias])) {
+            if (isset($binds[$alias])){
                 $previous[$alias] = $binds[$alias];
-            } else {
+            }else{
                 // Store bindings to be removed
                 $cleanup[] = $alias;
             }
             // Store previous singletons
-            if (isset($singletons[$alias])) {
+            if (isset($singletons[$alias])){
                 $prevSin[$alias] = $singletons[$alias];
                 unset($singletons[$alias]);
             }
@@ -202,21 +202,21 @@ 
             $this->binder->bind($alias, $resolver);
         }
 
-        try {
+        try{
             return ContainerScope::getContainer() !== $this
                 ? ContainerScope::runScope($this, $scope)
                 : $scope($this);
-        } finally {
+        }finally{
             // Remove new bindings
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias){
                 unset($binds[$alias], $singletons[$alias]);
             }
             // Restore previous bindings
-            foreach ($previous as $alias => $resolver) {
+            foreach ($previous as $alias => $resolver){
                 $binds[$alias] = $resolver;
             }
             // Restore singletons
-            foreach ($prevSin as $alias => $instance) {
+            foreach ($prevSin as $alias => $instance){
                 $singletons[$alias] = $instance;
             }
         }
@@ -264,9 +264,9 @@ 
      * @throws SingletonOverloadException
      * @throws \Throwable
      */
-    public function bindSingleton(string $alias, string|array|callable|object $resolver, ?bool $force = null): void
+    public function bindSingleton(string $alias, string | array | callable | object $resolver, ?bool $force = null): void
     {
-        if ($force ?? $this->options->allowSingletonsRebind) {
+        if ($force ?? $this->options->allowSingletonsRebind){
             $this->binder->removeBinding($alias);
         }
 
@@ -293,7 +293,7 @@ 
     {
         return ContainerScope::getContainer() === $this
             ? $this->invoker->invoke($target, $parameters)
-            : ContainerScope::runScope($this, fn (): mixed => $this->invoker->invoke($target, $parameters));
+            : ContainerScope::runScope($this, fn () : mixed => $this->invoker->invoke($target, $parameters));
     }
 
     /**
@@ -337,8 +337,8 @@ 
         ], $this->options);
 
         // Create container services
-        foreach ($container->config as $property => $class) {
-            if (\property_exists($container, $property)) {
+        foreach ($container->config as $property => $class){
+            if (\property_exists($container, $property)){
                 $container->$property = $constructor->get($property, $class);
             }
         }
@@ -352,7 +352,7 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope)){
             $this->destruct();
             return;
         }
@@ -361,10 +361,10 @@ 
 
         // Run finalizers
         $errors = [];
-        foreach ($this->state->finalizers as $finalizer) {
-            try {
+        foreach ($this->state->finalizers as $finalizer){
+            try{
                 $this->invoker->invoke($finalizer);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 $errors[] = $e;
             }
         }
@@ -373,7 +373,7 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== []){
             throw new FinalizersException($scopeName, $errors);
         }
     }
@@ -395,18 +395,18 @@ 
         $container->scope->setParent($this, $this->scope, $this->factory);
 
         // Add specific bindings
-        foreach ($config->bindings as $alias => $resolver) {
+        foreach ($config->bindings as $alias => $resolver){
             $container->binder->bind($alias, $resolver);
         }
 
         return ContainerScope::runScope(
             $container,
             static function (self $container) use ($config, $closure): mixed {
-                try {
+                try{
                     return $config->autowire
                         ? $container->invoke($closure)
                         : $closure($container);
-                } finally {
+                }finally{
                     $container->closeScope();
                 }
             }

Braces +48 added lines, -22 removed lines

@@ -63,7 +63,8 @@ 
         string|\BackedEnum|null $scopeName = self::DEFAULT_ROOT_SCOPE_NAME,
         private Options $options = new Options(),
     ) {
-        if (\is_object($scopeName)) {
+        if (\is_object($scopeName))
+        {
             $scopeName = (string) $scopeName->value;
         }
 
@@ -178,23 +179,29 @@ 
      */
     public function runScope(Scope|array $bindings, callable $scope): mixed
     {
-        if (!\is_array($bindings)) {
+        if (!\is_array($bindings))
+        {
             return $this->runIsolatedScope($bindings, $scope);
         }
 
         $binds = &$this->state->bindings;
         $singletons = &$this->state->singletons;
         $cleanup = $previous = $prevSin = [];
-        foreach ($bindings as $alias => $resolver) {
+        foreach ($bindings as $alias => $resolver)
+        {
             // Store previous bindings
-            if (isset($binds[$alias])) {
+            if (isset($binds[$alias]))
+            {
                 $previous[$alias] = $binds[$alias];
-            } else {
+            }
+            else
+            {
                 // Store bindings to be removed
                 $cleanup[] = $alias;
             }
             // Store previous singletons
-            if (isset($singletons[$alias])) {
+            if (isset($singletons[$alias]))
+            {
                 $prevSin[$alias] = $singletons[$alias];
                 unset($singletons[$alias]);
             }
@@ -202,21 +209,27 @@ 
             $this->binder->bind($alias, $resolver);
         }
 
-        try {
+        try
+        {
             return ContainerScope::getContainer() !== $this
                 ? ContainerScope::runScope($this, $scope)
                 : $scope($this);
-        } finally {
+        }
+        finally
+        {
             // Remove new bindings
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias)
+            {
                 unset($binds[$alias], $singletons[$alias]);
             }
             // Restore previous bindings
-            foreach ($previous as $alias => $resolver) {
+            foreach ($previous as $alias => $resolver)
+            {
                 $binds[$alias] = $resolver;
             }
             // Restore singletons
-            foreach ($prevSin as $alias => $instance) {
+            foreach ($prevSin as $alias => $instance)
+            {
                 $singletons[$alias] = $instance;
             }
         }
@@ -266,7 +279,8 @@ 
      */
     public function bindSingleton(string $alias, string|array|callable|object $resolver, ?bool $force = null): void
     {
-        if ($force ?? $this->options->allowSingletonsRebind) {
+        if ($force ?? $this->options->allowSingletonsRebind)
+        {
             $this->binder->removeBinding($alias);
         }
 
@@ -337,8 +351,10 @@ 
         ], $this->options);
 
         // Create container services
-        foreach ($container->config as $property => $class) {
-            if (\property_exists($container, $property)) {
+        foreach ($container->config as $property => $class)
+        {
+            if (\property_exists($container, $property))
+            {
                 $container->$property = $constructor->get($property, $class);
             }
         }
@@ -352,7 +368,8 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope))
+        {
             $this->destruct();
             return;
         }
@@ -361,10 +378,14 @@ 
 
         // Run finalizers
         $errors = [];
-        foreach ($this->state->finalizers as $finalizer) {
-            try {
+        foreach ($this->state->finalizers as $finalizer)
+        {
+            try
+            {
                 $this->invoker->invoke($finalizer);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 $errors[] = $e;
             }
         }
@@ -373,7 +394,8 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== [])
+        {
             throw new FinalizersException($scopeName, $errors);
         }
     }
@@ -395,18 +417,22 @@ 
         $container->scope->setParent($this, $this->scope, $this->factory);
 
         // Add specific bindings
-        foreach ($config->bindings as $alias => $resolver) {
+        foreach ($config->bindings as $alias => $resolver)
+        {
             $container->binder->bind($alias, $resolver);
         }
 
         return ContainerScope::runScope(
             $container,
             static function (self $container) use ($config, $closure): mixed {
-                try {
+                try
+                {
                     return $config->autowire
                         ? $container->invoke($closure)
                         : $closure($container);
-                } finally {
+                }
+                finally
+                {
                     $container->closeScope();
                 }
             }

src/Core/src/Config/Shared.php

Spacing +2 added lines, -2 removed lines

@@ -12,10 +12,10 @@
     public function __construct(
         public readonly object $value,
         public readonly bool $singleton = false,
-    ) {}
+    ){}
 
     public function __toString(): string
     {
-        return 'Shared object of class ' . $this->value::class;
+        return 'Shared object of class '.$this->value::class;
     }
 }

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
     public function __construct(
         public readonly object $value,
         public readonly bool $singleton = false,
-    ) {}
+    ) {
+}
 
     public function __toString(): string
     {

src/Core/src/Internal/Factory.php

Spacing +69 added lines, -69 removed lines

@@ -68,19 +68,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',
@@ -110,7 +110,7 @@ 
                     ->resolveWeakReference($binding, $alias, $context, $parameters),
                 default => $binding,
             };
-        } finally {
+        }finally{
             $this->state->bindings[$alias] ??= $binding;
             $this->tracer->pop(true);
             $this->tracer->pop(false);
@@ -124,18 +124,18 @@ 
     private function resolveInjector(Config\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'.",
@@ -162,7 +162,7 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance)){
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -172,7 +172,7 @@ 
             }
 
             return $instance;
-        } finally {
+        }finally{
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -180,27 +180,27 @@ 
     private function resolveAlias(
         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;
         }
 
         return $result;
     }
 
-    private function resolveProxy(Config\Proxy $binding, string $alias, Stringable|string|null $context): mixed
+    private function resolveProxy(Config\Proxy $binding, string $alias, Stringable | string | null $context): mixed
     {
-        if ($context instanceof RetryContext) {
+        if ($context instanceof RetryContext){
             return $binding->fallbackFactory === null
                 ? throw new RecursiveProxyException(
                     $alias,
@@ -211,7 +211,7 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getInterface()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $result;
         }
 
@@ -221,19 +221,19 @@ 
     private function resolveShared(
         Config\Shared $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): object {
         $avoidCache = $arguments !== [];
 
-        if ($avoidCache) {
+        if ($avoidCache){
             return $this->createInstance(
                 new Ctx(alias: $alias, class: $binding->value::class, context: $context),
                 $arguments,
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -243,7 +243,7 @@ 
     private function resolveAutowire(
         Config\Autowire $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): mixed {
         $target = $binding->autowire->alias;
@@ -257,17 +257,17 @@ 
     }
 
     private function resolveFactory(
-        Config\Factory|Config\DeferredFactory $binding,
+        Config\Factory | Config\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 === 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(),
@@ -281,24 +281,24 @@ 
     private function resolveWeakReference(
         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(
@@ -308,7 +308,7 @@ 
                         )
                     )
                 );
-            } finally {
+            }finally{
                 $this->tracer->pop();
             }
         }
@@ -319,23 +319,23 @@ 
     private function resolveWithoutBinding(
         string $alias,
         array $parameters = [],
-        Stringable|string|null $context = null
+        Stringable | string | null $context = null
     ): mixed {
         $parent = $this->scope->getParentFactory();
 
-        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(),
                 ]);
                 /** @psalm-suppress TooManyArguments */
                 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,
                     $e instanceof RecursiveProxyException => throw $e,
@@ -345,19 +345,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);
         }
     }
@@ -378,7 +378,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(),
@@ -404,13 +404,13 @@ 
         Ctx $ctx,
         array $arguments,
     ): object {
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope){
             // Check scope name
             $ctx->reflection = new \ReflectionClass($instance);
             $scopeName = ($ctx->reflection->getAttributes(Attribute\Scope::class)[0] ?? null)?->newInstance()->name;
-            if ($scopeName !== null) {
+            if ($scopeName !== null){
                 $scope = $this->scope;
-                while ($scope->getScopeName() !== $scopeName) {
+                while ($scope->getScopeName() !== $scopeName){
                     $scope = $scope->getParentScope() ?? throw new BadScopeException($scopeName, $instance::class);
                 }
             }
@@ -439,26 +439,26 @@ 
         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
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope){
             $scope = ($reflection->getAttributes(Attribute\Scope::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',
@@ -471,12 +471,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, $this->options->validateArguments);
-            } catch (ValidationException $e) {
+            }catch (ValidationException $e){
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -486,22 +486,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();
         }
@@ -519,13 +519,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;
         }
 
@@ -537,12 +537,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;
         }
 
@@ -556,7 +556,7 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 
@@ -570,10 +570,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);
@@ -589,9 +589,9 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try{
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
 

Braces +133 added lines, -58 removed lines

@@ -70,17 +70,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',
@@ -110,7 +113,9 @@ 
                     ->resolveWeakReference($binding, $alias, $context, $parameters),
                 default => $binding,
             };
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$alias] ??= $binding;
             $this->tracer->pop(true);
             $this->tracer->pop(false);
@@ -124,18 +129,23 @@ 
     private function resolveInjector(Config\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'.",
@@ -162,7 +172,8 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -172,7 +183,9 @@ 
             }
 
             return $instance;
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -191,7 +204,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;
         }
 
@@ -200,7 +214,8 @@ 
 
     private function resolveProxy(Config\Proxy $binding, string $alias, Stringable|string|null $context): mixed
     {
-        if ($context instanceof RetryContext) {
+        if ($context instanceof RetryContext)
+        {
             return $binding->fallbackFactory === null
                 ? throw new RecursiveProxyException(
                     $alias,
@@ -211,7 +226,8 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getInterface()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -226,14 +242,16 @@ 
     ): object {
         $avoidCache = $arguments !== [];
 
-        if ($avoidCache) {
+        if ($avoidCache)
+        {
             return $this->createInstance(
                 new Ctx(alias: $alias, class: $binding->value::class, context: $context),
                 $arguments,
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -263,11 +281,14 @@ 
         array $arguments,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton);
-        try {
+        try
+        {
             $instance = $binding::class === 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(),
@@ -286,19 +307,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(
@@ -308,7 +334,9 @@ 
                         )
                     )
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop();
             }
         }
@@ -323,19 +351,26 @@ 
     ): mixed {
         $parent = $this->scope->getParentFactory();
 
-        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(),
                 ]);
                 /** @psalm-suppress TooManyArguments */
                 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,
                     $e instanceof RecursiveProxyException => throw $e,
@@ -345,19 +380,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);
         }
     }
@@ -404,13 +444,16 @@ 
         Ctx $ctx,
         array $arguments,
     ): object {
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope)
+        {
             // Check scope name
             $ctx->reflection = new \ReflectionClass($instance);
             $scopeName = ($ctx->reflection->getAttributes(Attribute\Scope::class)[0] ?? null)?->newInstance()->name;
-            if ($scopeName !== null) {
+            if ($scopeName !== null)
+            {
                 $scope = $this->scope;
-                while ($scope->getScopeName() !== $scopeName) {
+                while ($scope->getScopeName() !== $scopeName)
+                {
                     $scope = $scope->getParentScope() ?? throw new BadScopeException($scopeName, $instance::class);
                 }
             }
@@ -439,26 +482,33 @@ 
         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
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope)
+        {
             $scope = ($reflection->getAttributes(Attribute\Scope::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',
@@ -471,12 +521,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, $this->options->validateArguments);
-            } catch (ValidationException $e) {
+            }
+            catch (ValidationException $e)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -486,22 +540,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();
         }
@@ -519,13 +582,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;
         }
 
@@ -537,12 +602,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;
         }
 
@@ -556,7 +623,8 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -570,10 +638,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);
@@ -589,9 +661,12 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try
+        {
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             return false;
         }