spiral / framework

src/Cookies/tests/CookiesTest.php

Spacing +13 added lines, -13 removed lines

@@ -53,7 +53,7 @@ 
     public function testScope(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             $this->assertInstanceOf(
                 CookieQueue::class,
                 ContainerScope::getContainer()->get(ServerRequestInterface::class)
@@ -77,7 +77,7 @@ 
     public function testSetEncryptedCookie(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             ContainerScope::getContainer()->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -99,7 +99,7 @@ 
     public function testSetNotProtectedCookie(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             ContainerScope::getContainer()->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('PHPSESSID', 'value');
 
@@ -118,7 +118,7 @@ 
     public function testDecrypt(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
 
             /**
              * @var ServerRequest $r
@@ -136,7 +136,7 @@ 
     public function testDecryptArray(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
 
             /**
              * @var ServerRequest $r
@@ -154,7 +154,7 @@ 
     public function testDecryptBroken(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
 
             /**
              * @var ServerRequest $r
@@ -162,7 +162,7 @@ 
             return $r->getCookieParams()['name'];
         });
 
-        $value = $this->container->get(EncrypterInterface::class)->encrypt('cookie-value') . 'BROKEN';
+        $value = $this->container->get(EncrypterInterface::class)->encrypt('cookie-value').'BROKEN';
 
         $response = $this->get($core, '/', [], [], ['name' => $value]);
         $this->assertSame(200, $response->getStatusCode());
@@ -172,7 +172,7 @@ 
     public function testDelete(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             ContainerScope::getContainer()->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -200,7 +200,7 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             ContainerScope::getContainer()->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -225,7 +225,7 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
 
             /**
              * @var ServerRequest $r
@@ -249,7 +249,7 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             ContainerScope::getContainer()->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -263,7 +263,7 @@ 
         $cookies = $this->fetchCookies($response);
         $this->assertArrayHasKey('name', $cookies);
 
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r){
             return $r->getCookieParams()['name'];
         });
 
@@ -318,7 +318,7 @@ 
     {
         $result = [];
 
-        foreach ($response->getHeaders() as $line) {
+        foreach ($response->getHeaders() as $line){
             $cookie = explode('=', implode('', $line));
             $result[$cookie[0]] = rawurldecode(substr(
                 (string)$cookie[1],

Braces +24 added lines, -12 removed lines

@@ -53,7 +53,8 @@ 
     public function testScope(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             $this->assertInstanceOf(
                 CookieQueue::class,
                 ContainerScope::getContainer()->get(ServerRequestInterface::class)
@@ -77,7 +78,8 @@ 
     public function testSetEncryptedCookie(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             ContainerScope::getContainer()->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -99,7 +101,8 @@ 
     public function testSetNotProtectedCookie(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             ContainerScope::getContainer()->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('PHPSESSID', 'value');
 
@@ -118,7 +121,8 @@ 
     public function testDecrypt(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
 
             /**
              * @var ServerRequest $r
@@ -136,7 +140,8 @@ 
     public function testDecryptArray(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
 
             /**
              * @var ServerRequest $r
@@ -154,7 +159,8 @@ 
     public function testDecryptBroken(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
 
             /**
              * @var ServerRequest $r
@@ -172,7 +178,8 @@ 
     public function testDelete(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             ContainerScope::getContainer()->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -200,7 +207,8 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             ContainerScope::getContainer()->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -225,7 +233,8 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
 
             /**
              * @var ServerRequest $r
@@ -249,7 +258,8 @@ 
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             ContainerScope::getContainer()->get(ServerRequestInterface::class)
                 ->getAttribute(CookieQueue::ATTRIBUTE)->set('name', 'value');
 
@@ -263,7 +273,8 @@ 
         $cookies = $this->fetchCookies($response);
         $this->assertArrayHasKey('name', $cookies);
 
-        $core->setHandler(function ($r) {
+        $core->setHandler(function ($r)
+        {
             return $r->getCookieParams()['name'];
         });
 
@@ -318,7 +329,8 @@ 
     {
         $result = [];
 
-        foreach ($response->getHeaders() as $line) {
+        foreach ($response->getHeaders() as $line)
+        {
             $cookie = explode('=', implode('', $line));
             $result[$cookie[0]] = rawurldecode(substr(
                 (string)$cookie[1],

src/Http/tests/HttpTest.php

Spacing +15 added lines, -15 removed lines

@@ -45,7 +45,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return 'hello world';
         });
 
@@ -67,7 +67,7 @@ 
     {
         $core = $this->getCore();
         $core->setHandler(
-            new CallableHandler(function () {
+            new CallableHandler(function (){
                 return 'hello world';
             }, new ResponseFactory(new HttpConfig(['headers' => []])))
         );
@@ -80,7 +80,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp){
             return $resp->withAddedHeader('hello', 'value');
         });
 
@@ -93,7 +93,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp){
             echo 'hello!';
 
             return $resp->withAddedHeader('hello', 'value');
@@ -109,7 +109,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp){
             echo 'hello!';
             $resp->getBody()->write('world ');
 
@@ -126,7 +126,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             ob_start();
             ob_start();
             echo 'hello!';
@@ -147,7 +147,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return [
                 'status' => 404,
                 'message' => 'not found',
@@ -163,7 +163,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return new Json([
                 'status' => 404,
                 'message' => 'not found',
@@ -179,7 +179,7 @@ 
     {
         $core = $this->getCore([HeaderMiddleware::class]);
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return 'hello?';
         });
 
@@ -196,7 +196,7 @@ 
         $core->getPipeline()->pushMiddleware(new Header2Middleware());
         $core->getPipeline()->riseMiddleware(new HeaderMiddleware());
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return 'hello?';
         });
 
@@ -213,7 +213,7 @@ 
         $core->getPipeline()->pushMiddleware(new HeaderMiddleware());
         $core->getPipeline()->riseMiddleware(new Header2Middleware());
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return 'hello?';
         });
 
@@ -227,7 +227,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             $this->assertTrue(ContainerScope::getContainer()->has(ServerRequestInterface::class));
 
             return 'OK';
@@ -260,12 +260,12 @@ 
         $dispatcher
             ->expects(self::exactly(2))
             ->method('dispatch')
-            ->with($this->callback(static fn(RequestReceived|RequestHandled $event): bool => true));
+            ->with($this->callback(static fn(RequestReceived | RequestHandled $event): bool => true));
         $this->container->bind(EventDispatcherInterface::class, $dispatcher);
 
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function (){
             return 'hello world';
         });
 
@@ -286,7 +286,7 @@ 
             $tracerFactory = m::mock(TracerFactoryInterface::class),
         );
 
-        $http->setHandler(function () {
+        $http->setHandler(function (){
             return 'hello world';
         });
 

Braces +28 added lines, -14 removed lines

@@ -45,7 +45,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return 'hello world';
         });
 
@@ -67,7 +68,8 @@ 
     {
         $core = $this->getCore();
         $core->setHandler(
-            new CallableHandler(function () {
+            new CallableHandler(function ()
+            {
                 return 'hello world';
             }, new ResponseFactory(new HttpConfig(['headers' => []])))
         );
@@ -80,7 +82,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp)
+        {
             return $resp->withAddedHeader('hello', 'value');
         });
 
@@ -93,7 +96,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp)
+        {
             echo 'hello!';
 
             return $resp->withAddedHeader('hello', 'value');
@@ -109,7 +113,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp)
+        {
             echo 'hello!';
             $resp->getBody()->write('world ');
 
@@ -126,7 +131,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             ob_start();
             ob_start();
             echo 'hello!';
@@ -147,7 +153,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return [
                 'status' => 404,
                 'message' => 'not found',
@@ -163,7 +170,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return new Json([
                 'status' => 404,
                 'message' => 'not found',
@@ -179,7 +187,8 @@ 
     {
         $core = $this->getCore([HeaderMiddleware::class]);
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return 'hello?';
         });
 
@@ -196,7 +205,8 @@ 
         $core->getPipeline()->pushMiddleware(new Header2Middleware());
         $core->getPipeline()->riseMiddleware(new HeaderMiddleware());
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return 'hello?';
         });
 
@@ -213,7 +223,8 @@ 
         $core->getPipeline()->pushMiddleware(new HeaderMiddleware());
         $core->getPipeline()->riseMiddleware(new Header2Middleware());
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return 'hello?';
         });
 
@@ -227,7 +238,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             $this->assertTrue(ContainerScope::getContainer()->has(ServerRequestInterface::class));
 
             return 'OK';
@@ -265,7 +277,8 @@ 
 
         $core = $this->getCore();
 
-        $core->setHandler(function () {
+        $core->setHandler(function ()
+        {
             return 'hello world';
         });
 
@@ -286,7 +299,8 @@ 
             $tracerFactory = m::mock(TracerFactoryInterface::class),
         );
 
-        $http->setHandler(function () {
+        $http->setHandler(function ()
+        {
             return 'hello world';
         });
 

src/Core/src/Internal/Binder.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function hasInstance(string $alias): bool
     {
-        if (!$this->container->has($alias)) {
+        if (!$this->container->has($alias)){
             return false;
         }
         return parent::hasInstance($alias);

Braces +2 added lines, -1 removed lines

@@ -28,7 +28,8 @@
 
     public function hasInstance(string $alias): bool
     {
-        if (!$this->container->has($alias)) {
+        if (!$this->container->has($alias))
+        {
             return false;
         }
         return parent::hasInstance($alias);

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

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
         public ?string $parameter = null,
         public ?bool $singleton = null,
         public ?\ReflectionClass $reflection = null,
-    ) {
+    ){
     }
 }

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

Spacing +13 added lines, -13 removed lines

@@ -18,15 +18,15 @@ 
 {
     public function __construct(
         protected readonly State $state,
-    ) {
+    ){
     }
 
     /**
      * @param TResolver|object $resolver
      */
-    public function bind(string $alias, string|array|callable|object $resolver): void
+    public function bind(string $alias, string | array | callable | object $resolver): void
     {
-        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire) {
+        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire){
             // array means = execute me, false = not singleton
             $this->state->bindings[$alias] = [$resolver, false];
 
@@ -39,9 +39,9 @@ 
     /**
      * @param TResolver|object $resolver
      */
-    public function bindSingleton(string $alias, string|array|callable|object $resolver): void
+    public function bindSingleton(string $alias, string | array | callable | object $resolver): void
     {
-        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire) {
+        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire){
             // direct binding to an instance
             $this->state->bindings[$alias] = $resolver;
 
@@ -55,7 +55,7 @@ 
     {
         $bindings = &$this->state->bindings;
 
-        while (\is_string($bindings[$alias] ?? null)) {
+        while (\is_string($bindings[$alias] ?? null)){
             //Checking alias tree
             $alias = $bindings[$alias];
         }
@@ -80,31 +80,31 @@ 
 
     public function hasInjector(string $class): bool
     {
-        try {
+        try{
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (\array_key_exists($class, $this->state->injectors)) {
+        if (\array_key_exists($class, $this->state->injectors)){
             return $this->state->injectors[$class] !== null;
         }
 
         if (
             $reflection->implementsInterface(InjectableInterface::class)
             && $reflection->hasConstant('INJECTOR')
-        ) {
+        ){
             $this->state->injectors[$class] = $reflection->getConstant('INJECTOR');
 
             return true;
         }
 
         // check interfaces
-        foreach ($this->state->injectors as $target => $injector) {
+        foreach ($this->state->injectors as $target => $injector){
             if (
                 \class_exists($target, true)
                 && $reflection->isSubclassOf($target)
-            ) {
+            ){
                 $this->state->injectors[$class] = $injector;
 
                 return true;
@@ -113,7 +113,7 @@ 
             if (
                 \interface_exists($target, true)
                 && $reflection->implementsInterface($target)
-            ) {
+            ){
                 $this->state->injectors[$class] = $injector;
 
                 return true;

Braces +15 added lines, -7 removed lines

@@ -26,7 +26,8 @@ 
      */
     public function bind(string $alias, string|array|callable|object $resolver): void
     {
-        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire) {
+        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire)
+        {
             // array means = execute me, false = not singleton
             $this->state->bindings[$alias] = [$resolver, false];
 
@@ -41,7 +42,8 @@ 
      */
     public function bindSingleton(string $alias, string|array|callable|object $resolver): void
     {
-        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire) {
+        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire)
+        {
             // direct binding to an instance
             $this->state->bindings[$alias] = $resolver;
 
@@ -55,7 +57,8 @@ 
     {
         $bindings = &$this->state->bindings;
 
-        while (\is_string($bindings[$alias] ?? null)) {
+        while (\is_string($bindings[$alias] ?? null))
+        {
             //Checking alias tree
             $alias = $bindings[$alias];
         }
@@ -80,13 +83,17 @@ 
 
     public function hasInjector(string $class): bool
     {
-        try {
+        try
+        {
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (\array_key_exists($class, $this->state->injectors)) {
+        if (\array_key_exists($class, $this->state->injectors))
+        {
             return $this->state->injectors[$class] !== null;
         }
 
@@ -100,7 +107,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)

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,19 +104,19 @@ 
                     : $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{
                 /** @psalm-var class-string $alias */
                 $this->state->bindings[$alias] ??= $binding;
             }
-        } finally {
+        }finally{
             $this->tracer->pop(true);
             $this->tracer->pop(false);
         }
@@ -130,18 +130,18 @@ 
     ): ?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);
         }
     }
@@ -216,7 +216,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(),
@@ -244,16 +244,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(),
@@ -263,10 +263,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);
                 }
             }
@@ -295,26 +295,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'.",
@@ -329,7 +329,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'.",
@@ -339,12 +339,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',
@@ -357,12 +357,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(
@@ -372,22 +372,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();
         }
@@ -411,13 +411,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;
         }
 
@@ -429,11 +429,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;
         }
 
@@ -444,7 +444,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,19 +109,25 @@ 
                     : $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
+            {
                 /** @psalm-var class-string $alias */
                 $this->state->bindings[$alias] ??= $binding;
             }
-        } finally {
+        }
+        finally
+        {
             $this->tracer->pop(true);
             $this->tracer->pop(false);
         }
@@ -130,18 +141,23 @@ 
     ): ?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);
         }
     }
@@ -244,16 +274,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(),
@@ -263,10 +302,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);
                 }
             }
@@ -295,26 +336,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'.",
@@ -329,7 +377,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'.",
@@ -339,12 +388,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',
@@ -357,12 +409,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(
@@ -372,22 +428,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();
         }
@@ -411,13 +476,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;
         }
 
@@ -429,11 +496,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;
         }
 
@@ -444,7 +513,8 @@ 
     {
         /** @var Finalize|null $attribute */
         $attribute = ($ctx->reflection->getAttributes(Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 

src/Core/src/ContainerScope.php

Spacing +4 added lines, -4 removed lines

@@ -34,22 +34,22 @@
     {
         [$previous, self::$container] = [self::$container, $container];
 
-        try {
-            if (Fiber::getCurrent() === null) {
+        try{
+            if (Fiber::getCurrent() === null){
                 return $scope(self::$container);
             }
 
             // Wrap scope into fiber
             $fiber = new Fiber(static fn () => $scope(self::$container));
             $value = $fiber->start();
-            while (!$fiber->isTerminated()) {
+            while (!$fiber->isTerminated()){
                 self::$container = $previous;
                 $resume = Fiber::suspend($value);
                 self::$container = $container;
                 $value = $fiber->resume($resume);
             }
             return $fiber->getReturn();
-        } finally {
+        }finally{
             self::$container = $previous;
         }
     }

Braces +9 added lines, -4 removed lines

@@ -34,22 +34,27 @@
     {
         [$previous, self::$container] = [self::$container, $container];
 
-        try {
-            if (Fiber::getCurrent() === null) {
+        try
+        {
+            if (Fiber::getCurrent() === null)
+            {
                 return $scope(self::$container);
             }
 
             // Wrap scope into fiber
             $fiber = new Fiber(static fn () => $scope(self::$container));
             $value = $fiber->start();
-            while (!$fiber->isTerminated()) {
+            while (!$fiber->isTerminated())
+            {
                 self::$container = $previous;
                 $resume = Fiber::suspend($value);
                 self::$container = $container;
                 $value = $fiber->resume($resume);
             }
             return $fiber->getReturn();
-        } finally {
+        }
+        finally
+        {
             self::$container = $previous;
         }
     }

src/Core/src/Attribute/Finalize.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 {
     public function __construct(
         public string $method,
-    ) {
+    ){
     }
 }

src/Core/src/Attribute/Scope.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 {
     public function __construct(
         public string $name,
-    ) {
+    ){
     }
 }