spiral / framework

src/Core/src/Internal/Factory.php

Spacing +54 added lines, -54 removed lines

@@ -64,13 +64,13 @@ 
      */
     public function make(string $alias, array $parameters = [], string $context = null): mixed
     {
-        if (!isset($this->state->bindings[$alias])) {
+        if (!isset($this->state->bindings[$alias])){
             return $this->resolveWithoutBinding($alias, $parameters, $context);
         }
 
         $avoidCache = $parameters !== [];
         $binding = $this->state->bindings[$alias];
-        try {
+        try{
             $this->tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -81,22 +81,22 @@ 
             );
             $this->tracer->push(true);
 
-            if (\is_object($binding)) {
-                if ($binding::class === WeakReference::class) {
+            if (\is_object($binding)){
+                if ($binding::class === WeakReference::class){
                     return $this->resolveWeakReference($binding, $alias, $context, $parameters);
                 }
 
                 // When binding is instance, assuming singleton
                 return $avoidCache
                     ? $this->createInstance(
-                        new Ctx(alias: $alias, class: $binding::class, parameter: $context),
+                        new Ctx(alias : $alias, class : $binding::class, parameter : $context),
                         $parameters,
                     )
                     : $binding;
             }
 
             $ctx = new Ctx(alias: $alias, class: $alias, parameter: $context);
-            if (\is_string($binding)) {
+            if (\is_string($binding)){
                 $ctx->class = $binding;
                 return $binding === $alias
                     ? $this->autowire($ctx, $parameters)
@@ -104,18 +104,18 @@ 
                     : $this->make($binding, $parameters, $context);
             }
 
-            if ($binding[1] === true) {
+            if ($binding[1] === true){
                 $ctx->singleton = true;
             }
             unset($this->state->bindings[$alias]);
-            try {
+            try{
                 return $binding[0] === $alias
                     ? $this->autowire($ctx, $parameters)
                     : $this->evaluateBinding($ctx, $binding[0], $parameters);
-            } finally {
+            }finally{
                 $this->state->bindings[$alias] ??= $binding;
             }
-        } finally {
+        }finally{
             $this->tracer->pop(true);
             $this->tracer->pop(false);
         }
@@ -129,19 +129,19 @@ 
     ): ?object {
         $avoidCache = $parameters !== [];
 
-        if (($avoidCache || $binding->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->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, parameter: $context),
                     $parameters,
                 );
-                if ($avoidCache) {
+                if ($avoidCache){
                     return $object;
                 }
                 $binding = $this->state->bindings[$alias] = WeakReference::create($object);
-            } catch (\Throwable) {
+            }catch (\Throwable){
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -151,7 +151,7 @@ 
                         )
                     )
                 );
-            } finally {
+            }finally{
                 $this->tracer->pop();
             }
         }
@@ -163,18 +163,18 @@ 
     {
         $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,
@@ -183,19 +183,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, parameter: $context),
                 $parameters,
             );
-        } finally {
+        }finally{
             $this->tracer->pop(false);
         }
     }
@@ -217,7 +217,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(),
@@ -245,16 +245,16 @@ 
         mixed $target,
         array $arguments,
     ): mixed {
-        if (\is_string($target)) {
+        if (\is_string($target)){
             // Reference
             $instance = $this->make($target, $arguments, $ctx->parameter);
-        } else {
-            if ($target instanceof Autowire) {
+        }else{
+            if ($target instanceof Autowire){
                 $instance = $target->resolve($this, $arguments);
-            } else {
-                try {
+            }else{
+                try{
                     $instance = $this->invoker->invoke($target, $arguments);
-                } catch (NotCallableException $e) {
+                }catch (NotCallableException $e){
                     throw new ContainerException(
                         $this->tracer->combineTraceMessage(\sprintf('Invalid binding for `%s`.', $ctx->alias)),
                         $e->getCode(),
@@ -264,10 +264,10 @@ 
             }
 
             // Check scope name
-            if (\is_object($instance)) {
+            if (\is_object($instance)){
                 $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);
                 }
             }
@@ -296,26 +296,26 @@ 
         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 ($parameters === [] && $this->binder->hasInjector($class)) {
+        if ($parameters === [] && $this->binder->hasInjector($class)){
             $injector = $this->state->injectors[$reflection->getName()];
 
-            try {
+            try{
                 $injectorInstance = $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'.",
@@ -330,7 +330,7 @@ 
                  * @psalm-suppress RedundantCondition
                  */
                 $instance = $injectorInstance->createInjection($reflection, $ctx->parameter);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance)){
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'.",
@@ -340,12 +340,12 @@ 
                 }
 
                 return $instance;
-            } finally {
+            }finally{
                 $this->state->injectors[$reflection->getName()] = $injector;
             }
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -358,12 +358,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(
@@ -373,22 +373,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();
         }
@@ -412,13 +412,13 @@ 
         $ctx->reflection ??= new \ReflectionClass($instance);
 
         //Declarative singletons
-        if ($this->isSingleton($ctx)) {
+        if ($this->isSingleton($ctx)){
             $this->state->bindings[$ctx->alias] = $instance;
         }
 
         // Register finalizer
         $finalizer = $this->getFinalizer($ctx, $instance);
-        if ($finalizer !== null) {
+        if ($finalizer !== null){
             $this->state->finalizers[] = $finalizer;
         }
 
@@ -430,11 +430,11 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if ($ctx->singleton === true) {
+        if ($ctx->singleton === true){
             return true;
         }
 
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class)){
             return true;
         }
 
@@ -448,7 +448,7 @@ 
          * @var Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 

Braces +122 added lines, -52 removed lines

@@ -64,13 +64,15 @@ 
      */
     public function make(string $alias, array $parameters = [], string $context = null): mixed
     {
-        if (!isset($this->state->bindings[$alias])) {
+        if (!isset($this->state->bindings[$alias]))
+        {
             return $this->resolveWithoutBinding($alias, $parameters, $context);
         }
 
         $avoidCache = $parameters !== [];
         $binding = $this->state->bindings[$alias];
-        try {
+        try
+        {
             $this->tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -81,8 +83,10 @@ 
             );
             $this->tracer->push(true);
 
-            if (\is_object($binding)) {
-                if ($binding::class === WeakReference::class) {
+            if (\is_object($binding))
+            {
+                if ($binding::class === WeakReference::class)
+                {
                     return $this->resolveWeakReference($binding, $alias, $context, $parameters);
                 }
 
@@ -96,7 +100,8 @@ 
             }
 
             $ctx = new Ctx(alias: $alias, class: $alias, parameter: $context);
-            if (\is_string($binding)) {
+            if (\is_string($binding))
+            {
                 $ctx->class = $binding;
                 return $binding === $alias
                     ? $this->autowire($ctx, $parameters)
@@ -104,18 +109,24 @@ 
                     : $this->make($binding, $parameters, $context);
             }
 
-            if ($binding[1] === true) {
+            if ($binding[1] === true)
+            {
                 $ctx->singleton = true;
             }
             unset($this->state->bindings[$alias]);
-            try {
+            try
+            {
                 return $binding[0] === $alias
                     ? $this->autowire($ctx, $parameters)
                     : $this->evaluateBinding($ctx, $binding[0], $parameters);
-            } finally {
+            }
+            finally
+            {
                 $this->state->bindings[$alias] ??= $binding;
             }
-        } finally {
+        }
+        finally
+        {
             $this->tracer->pop(true);
             $this->tracer->pop(false);
         }
@@ -129,19 +140,24 @@ 
     ): ?object {
         $avoidCache = $parameters !== [];
 
-        if (($avoidCache || $binding->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->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, parameter: $context),
                     $parameters,
                 );
-                if ($avoidCache) {
+                if ($avoidCache)
+                {
                     return $object;
                 }
                 $binding = $this->state->bindings[$alias] = WeakReference::create($object);
-            } catch (\Throwable) {
+            }
+            catch (\Throwable)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -151,7 +167,9 @@ 
                         )
                     )
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop();
             }
         }
@@ -163,18 +181,25 @@ 
     {
         $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,
@@ -183,19 +208,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, parameter: $context),
                 $parameters,
             );
-        } finally {
+        }
+        finally
+        {
             $this->tracer->pop(false);
         }
     }
@@ -245,16 +275,25 @@ 
         mixed $target,
         array $arguments,
     ): mixed {
-        if (\is_string($target)) {
+        if (\is_string($target))
+        {
             // Reference
             $instance = $this->make($target, $arguments, $ctx->parameter);
-        } else {
-            if ($target instanceof Autowire) {
+        }
+        else
+        {
+            if ($target instanceof Autowire)
+            {
                 $instance = $target->resolve($this, $arguments);
-            } else {
-                try {
+            }
+            else
+            {
+                try
+                {
                     $instance = $this->invoker->invoke($target, $arguments);
-                } catch (NotCallableException $e) {
+                }
+                catch (NotCallableException $e)
+                {
                     throw new ContainerException(
                         $this->tracer->combineTraceMessage(\sprintf('Invalid binding for `%s`.', $ctx->alias)),
                         $e->getCode(),
@@ -264,10 +303,12 @@ 
             }
 
             // Check scope name
-            if (\is_object($instance)) {
+            if (\is_object($instance))
+            {
                 $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);
                 }
             }
@@ -296,26 +337,33 @@ 
         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 ($parameters === [] && $this->binder->hasInjector($class)) {
+        if ($parameters === [] && $this->binder->hasInjector($class))
+        {
             $injector = $this->state->injectors[$reflection->getName()];
 
-            try {
+            try
+            {
                 $injectorInstance = $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'.",
@@ -330,7 +378,8 @@ 
                  * @psalm-suppress RedundantCondition
                  */
                 $instance = $injectorInstance->createInjection($reflection, $ctx->parameter);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance))
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'.",
@@ -340,12 +389,15 @@ 
                 }
 
                 return $instance;
-            } finally {
+            }
+            finally
+            {
                 $this->state->injectors[$reflection->getName()] = $injector;
             }
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -358,12 +410,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(
@@ -373,22 +429,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();
         }
@@ -412,13 +477,15 @@ 
         $ctx->reflection ??= new \ReflectionClass($instance);
 
         //Declarative singletons
-        if ($this->isSingleton($ctx)) {
+        if ($this->isSingleton($ctx))
+        {
             $this->state->bindings[$ctx->alias] = $instance;
         }
 
         // Register finalizer
         $finalizer = $this->getFinalizer($ctx, $instance);
-        if ($finalizer !== null) {
+        if ($finalizer !== null)
+        {
             $this->state->finalizers[] = $finalizer;
         }
 
@@ -430,11 +497,13 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if ($ctx->singleton === true) {
+        if ($ctx->singleton === true)
+        {
             return true;
         }
 
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class))
+        {
             return true;
         }
 
@@ -448,7 +517,8 @@ 
          * @var Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 

src/Queue/src/Interceptor/Push/Core.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
 {
     public function __construct(
         private readonly QueueInterface $connection
-    ) {
+    ){
     }
 
     /**
@@ -33,15 +33,15 @@ 
     ): string {
         \assert(\is_array($parameters['payload']));
 
-        if ($parameters['options'] === null) {
+        if ($parameters['options'] === null){
             $parameters['options'] = new Options();
         }
 
         $tracer = $this->getTracer();
 
         /** @psalm-suppress RedundantCondition */
-        if (\method_exists($parameters['options'], 'withHeader')) {
-            foreach ($tracer->getContext() as $key => $data) {
+        if (\method_exists($parameters['options'], 'withHeader')){
+            foreach ($tracer->getContext() as $key => $data){
                 $parameters['options'] = $parameters['options']->withHeader($key, $data);
             }
         }
@@ -61,9 +61,9 @@ 
 
     private function getTracer(): TracerInterface
     {
-        try {
+        try{
             return ContainerScope::getContainer()->get(TracerInterface::class);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             return new NullTracer();
         }
     }

Braces +11 added lines, -5 removed lines

@@ -33,15 +33,18 @@ 
     ): string {
         \assert(\is_array($parameters['payload']));
 
-        if ($parameters['options'] === null) {
+        if ($parameters['options'] === null)
+        {
             $parameters['options'] = new Options();
         }
 
         $tracer = $this->getTracer();
 
         /** @psalm-suppress RedundantCondition */
-        if (\method_exists($parameters['options'], 'withHeader')) {
-            foreach ($tracer->getContext() as $key => $data) {
+        if (\method_exists($parameters['options'], 'withHeader'))
+        {
+            foreach ($tracer->getContext() as $key => $data)
+            {
                 $parameters['options'] = $parameters['options']->withHeader($key, $data);
             }
         }
@@ -61,9 +64,12 @@ 
 
     private function getTracer(): TracerInterface
     {
-        try {
+        try
+        {
             return ContainerScope::getContainer()->get(TracerInterface::class);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             return new NullTracer();
         }
     }