spiral / framework

src/Console/src/Command.php

Braces +7 added lines, -3 removed lines

@@ -83,13 +83,15 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        if ($this->container === null) {
+        if ($this->container === null)
+        {
             throw new ScopeException('Container is not set');
         }
 
         $method = method_exists($this, 'perform') ? 'perform' : '__invoke';
 
-        try {
+        try
+        {
             [$this->input, $this->output] = [$this->prepareInput($input), $this->prepareOutput($input, $output)];
 
             $this->eventDispatcher?->dispatch(new CommandStarting($this, $this->input, $this->output));
@@ -122,7 +124,9 @@ 
             $this->eventDispatcher?->dispatch(new CommandFinished($this, $code, $this->input, $this->output));
 
             return $code;
-        } finally {
+        }
+        finally
+        {
             [$this->input, $this->output] = [null, null];
         }
     }

src/Router/src/Router.php

Spacing +25 added lines, -25 removed lines

@@ -52,9 +52,9 @@ 
         private readonly ContainerInterface $container,
         private readonly ?EventDispatcherInterface $eventDispatcher = null,
         ?TracerInterface $tracer = null,
-    ) {
+    ){
         $this->tracer = $tracer ?? new NullTracer();
-        $this->basePath = '/' . \ltrim($basePath, '/');
+        $this->basePath = '/'.\ltrim($basePath, '/');
     }
 
     /**
@@ -68,13 +68,13 @@ 
         return $this->tracer->trace(
             name: 'Routing',
             callback: function (SpanInterface $span) use ($request): \Psr\Http\Message\ResponseInterface {
-                try {
+                try{
                     $route = $this->matchRoute($request, $routeName);
-                } catch (RouteException $e) {
+                }catch (RouteException $e){
                     throw new RouterException('Invalid route definition', $e->getCode(), $e);
                 }
 
-                if ($route === null) {
+                if ($route === null){
                     $this->eventDispatcher?->dispatch(new RouteNotFound($request));
                     throw new RouteNotFoundException($request->getUri());
                 }
@@ -109,7 +109,7 @@ 
 
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name])){
             return $this->routes[$name];
         }
 
@@ -118,7 +118,7 @@ 
 
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default)){
             return $this->routes + [null => $this->default];
         }
 
@@ -127,9 +127,9 @@ 
 
     public function uri(string $route, iterable $parameters = []): UriInterface
     {
-        try {
+        try{
             return $this->getRoute($route)->uri($parameters);
-        } catch (UndefinedRouteException) {
+        }catch (UndefinedRouteException){
             //In some cases route name can be provided as controller:action pair, we can try to
             //generate such route automatically based on our default/fallback route
             return $this->castRoute($route)->uri($parameters);
@@ -141,9 +141,9 @@ 
         /** @var GroupRegistry $groups */
         $groups = $this->container->get(GroupRegistry::class);
 
-        foreach ($routes->getCollection() as $name => $configurator) {
+        foreach ($routes->getCollection() as $name => $configurator){
             $target = $configurator->target;
-            if ($configurator->core !== null && $target instanceof AbstractTarget) {
+            if ($configurator->core !== null && $target instanceof AbstractTarget){
                 $target = $target->withCore($configurator->core);
             }
 
@@ -152,21 +152,21 @@ 
                 : \ltrim($configurator->pattern, '/');
             $route = new Route($pattern, $target, $configurator->defaults);
 
-            if ($configurator->middleware !== null) {
+            if ($configurator->middleware !== null){
                 $route = $route->withMiddleware(...$configurator->middleware);
             }
 
-            if ($configurator->methods !== null) {
+            if ($configurator->methods !== null){
                 $route = $route->withVerbs(...$configurator->methods);
             }
 
-            if (!isset($this->routes[$name]) && $name !== RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if (!isset($this->routes[$name]) && $name !== RoutingConfigurator::DEFAULT_ROUTE_NAME){
                 $group = $groups->getGroup($configurator->group ?? $groups->getDefaultGroup());
                 $group->setPrefix($configurator->prefix);
                 $group->addRoute($name, $route);
             }
 
-            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME){
                 $this->setDefault($route);
             }
         }
@@ -177,17 +177,17 @@ 
      */
     protected function matchRoute(ServerRequestInterface $request, ?string &$routeName = null): ?RouteInterface
     {
-        foreach ($this->routes as $name => $route) {
+        foreach ($this->routes as $name => $route){
             // Matched route will return new route instance with matched parameters
             $matched = $route->match($request);
 
-            if ($matched !== null) {
+            if ($matched !== null){
                 $routeName = $name;
                 return $matched;
             }
         }
 
-        if ($this->default !== null) {
+        if ($this->default !== null){
             return $this->default->match($request);
         }
 
@@ -200,14 +200,14 @@ 
      */
     protected function configure(RouteInterface $route): RouteInterface
     {
-        if ($route instanceof ContainerizedInterface && !$route->hasContainer()) {
+        if ($route instanceof ContainerizedInterface && !$route->hasContainer()){
             // isolating route in a given container
             $route = $route->withContainer($this->container);
         }
 
-        try {
+        try{
             $uriHandler = $route->getUriHandler();
-        } catch (\Throwable) {
+        }catch (\Throwable){
             $uriHandler = $this->uriHandler;
         }
 
@@ -230,7 +230,7 @@ 
                 $route,
                 $matches
             )
-        ) {
+        ){
             throw new UndefinedRouteException(
                 "Unable to locate route or use default route with 'name/controller:action' pattern"
             );
@@ -239,11 +239,11 @@ 
         /**
          * @var Matches $matches
          */
-        if (!empty($matches['name'])) {
+        if (!empty($matches['name'])){
             $routeObject = $this->getRoute($matches['name']);
-        } elseif ($this->default !== null) {
+        } elseif ($this->default !== null){
             $routeObject = $this->default;
-        } else {
+        }else{
             throw new UndefinedRouteException(\sprintf('Unable to locate route candidate for `%s`', $route));
         }
 

Braces +49 added lines, -22 removed lines

@@ -68,13 +68,17 @@ 
         return $this->tracer->trace(
             name: 'Routing',
             callback: function (SpanInterface $span) use ($request): \Psr\Http\Message\ResponseInterface {
-                try {
+                try
+                {
                     $route = $this->matchRoute($request, $routeName);
-                } catch (RouteException $e) {
+                }
+                catch (RouteException $e)
+                {
                     throw new RouterException('Invalid route definition', $e->getCode(), $e);
                 }
 
-                if ($route === null) {
+                if ($route === null)
+                {
                     $this->eventDispatcher?->dispatch(new RouteNotFound($request));
                     throw new RouteNotFoundException($request->getUri());
                 }
@@ -109,7 +113,8 @@ 
 
     public function getRoute(string $name): RouteInterface
     {
-        if (isset($this->routes[$name])) {
+        if (isset($this->routes[$name]))
+        {
             return $this->routes[$name];
         }
 
@@ -118,7 +123,8 @@ 
 
     public function getRoutes(): array
     {
-        if (!empty($this->default)) {
+        if (!empty($this->default))
+        {
             return $this->routes + [null => $this->default];
         }
 
@@ -127,9 +133,12 @@ 
 
     public function uri(string $route, iterable $parameters = []): UriInterface
     {
-        try {
+        try
+        {
             return $this->getRoute($route)->uri($parameters);
-        } catch (UndefinedRouteException) {
+        }
+        catch (UndefinedRouteException)
+        {
             //In some cases route name can be provided as controller:action pair, we can try to
             //generate such route automatically based on our default/fallback route
             return $this->castRoute($route)->uri($parameters);
@@ -141,9 +150,11 @@ 
         /** @var GroupRegistry $groups */
         $groups = $this->container->get(GroupRegistry::class);
 
-        foreach ($routes->getCollection() as $name => $configurator) {
+        foreach ($routes->getCollection() as $name => $configurator)
+        {
             $target = $configurator->target;
-            if ($configurator->core !== null && $target instanceof AbstractTarget) {
+            if ($configurator->core !== null && $target instanceof AbstractTarget)
+            {
                 $target = $target->withCore($configurator->core);
             }
 
@@ -152,21 +163,25 @@ 
                 : \ltrim($configurator->pattern, '/');
             $route = new Route($pattern, $target, $configurator->defaults);
 
-            if ($configurator->middleware !== null) {
+            if ($configurator->middleware !== null)
+            {
                 $route = $route->withMiddleware(...$configurator->middleware);
             }
 
-            if ($configurator->methods !== null) {
+            if ($configurator->methods !== null)
+            {
                 $route = $route->withVerbs(...$configurator->methods);
             }
 
-            if (!isset($this->routes[$name]) && $name !== RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if (!isset($this->routes[$name]) && $name !== RoutingConfigurator::DEFAULT_ROUTE_NAME)
+            {
                 $group = $groups->getGroup($configurator->group ?? $groups->getDefaultGroup());
                 $group->setPrefix($configurator->prefix);
                 $group->addRoute($name, $route);
             }
 
-            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME) {
+            if ($name === RoutingConfigurator::DEFAULT_ROUTE_NAME)
+            {
                 $this->setDefault($route);
             }
         }
@@ -177,17 +192,20 @@ 
      */
     protected function matchRoute(ServerRequestInterface $request, ?string &$routeName = null): ?RouteInterface
     {
-        foreach ($this->routes as $name => $route) {
+        foreach ($this->routes as $name => $route)
+        {
             // Matched route will return new route instance with matched parameters
             $matched = $route->match($request);
 
-            if ($matched !== null) {
+            if ($matched !== null)
+            {
                 $routeName = $name;
                 return $matched;
             }
         }
 
-        if ($this->default !== null) {
+        if ($this->default !== null)
+        {
             return $this->default->match($request);
         }
 
@@ -200,14 +218,18 @@ 
      */
     protected function configure(RouteInterface $route): RouteInterface
     {
-        if ($route instanceof ContainerizedInterface && !$route->hasContainer()) {
+        if ($route instanceof ContainerizedInterface && !$route->hasContainer())
+        {
             // isolating route in a given container
             $route = $route->withContainer($this->container);
         }
 
-        try {
+        try
+        {
             $uriHandler = $route->getUriHandler();
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             $uriHandler = $this->uriHandler;
         }
 
@@ -239,11 +261,16 @@ 
         /**
          * @var Matches $matches
          */
-        if (!empty($matches['name'])) {
+        if (!empty($matches['name']))
+        {
             $routeObject = $this->getRoute($matches['name']);
-        } elseif ($this->default !== null) {
+        }
+        elseif ($this->default !== null)
+        {
             $routeObject = $this->default;
-        } else {
+        }
+        else
+        {
             throw new UndefinedRouteException(\sprintf('Unable to locate route candidate for `%s`', $route));
         }
 

src/SendIt/tests/JobTest.php

Spacing +2 added lines, -2 removed lines

@@ -57,13 +57,13 @@
 
         $this->mailer->expects('send')->with($email)->andThrow(new TransportException('failed'));
 
-        try {
+        try{
             $this->getHandler()->handle(
                 MailQueue::JOB_NAME,
                 'id',
                 json_encode(MessageSerializer::pack($this->getMail()))
             );
-        } catch (TransportException) {
+        }catch (TransportException){
         }
     }
 

Braces +5 added lines, -2 removed lines

@@ -57,13 +57,16 @@
 
         $this->mailer->expects('send')->with($email)->andThrow(new TransportException('failed'));
 
-        try {
+        try
+        {
             $this->getHandler()->handle(
                 MailQueue::JOB_NAME,
                 'id',
                 json_encode(MessageSerializer::pack($this->getMail()))
             );
-        } catch (TransportException) {
+        }
+        catch (TransportException)
+        {
         }
     }
 

src/Storage/src/Bootloader/StorageBootloader.php

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
 
     public function __construct(
         private readonly ConfiguratorInterface $config
-    ) {
+    ){
     }
 
     public function init(BinderInterface $binder, EnvironmentInterface $env): void
@@ -50,13 +50,13 @@ 
 
             $distributions = $config->getDistributions();
 
-            foreach ($config->getAdapters() as $name => $adapter) {
+            foreach ($config->getAdapters() as $name => $adapter){
                 $resolver = null;
 
-                if (isset($distributions[$name])) {
-                    try {
+                if (isset($distributions[$name])){
+                    try{
                         $cdn = $factory->make(CdnInterface::class);
-                    } catch (NotFoundException $e) {
+                    }catch (NotFoundException $e){
                         $message = 'Unable to create distribution for bucket "%s". '
                             . 'Please make sure that bootloader %s is added in your application';
                         $message = \sprintf($message, $name, DistributionBootloader::class);

src/Http/tests/HttpTest.php

Spacing +4 added lines, -4 removed lines

@@ -89,7 +89,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp){
             echo 'hello!';
 
             return $resp->withAddedHeader('hello', 'value');
@@ -105,7 +105,7 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp){
             echo 'hello!';
             $resp->getBody()->write('world ');
 
@@ -232,7 +232,7 @@ 
         $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();
@@ -289,7 +289,7 @@ 
                 TraceKind::SERVER,
             )
             ->willReturnCallback(
-                function ($name, $callback, $attributes, $scoped, $traceKind) {
+                function ($name, $callback, $attributes, $scoped, $traceKind){
                     self::assertSame($attributes, [
                         'http.method' => 'GET',
                         'http.url' => 'http://example.org/path',

Braces +6 added lines, -3 removed lines

@@ -89,7 +89,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp)
+        {
             echo 'hello!';
 
             return $resp->withAddedHeader('hello', 'value');
@@ -105,7 +106,8 @@ 
     {
         $core = $this->getCore();
 
-        $core->setHandler(function ($req, $resp) {
+        $core->setHandler(function ($req, $resp)
+        {
             echo 'hello!';
             $resp->getBody()->write('world ');
 
@@ -289,7 +291,8 @@ 
                 TraceKind::SERVER,
             )
             ->willReturnCallback(
-                function ($name, $callback, $attributes, $scoped, $traceKind) {
+                function ($name, $callback, $attributes, $scoped, $traceKind)
+                {
                     self::assertSame($attributes, [
                         'http.method' => 'GET',
                         'http.url' => 'http://example.org/path',

src/Cookies/tests/CookiesTest.php

Spacing +2 added lines, -2 removed lines

@@ -130,7 +130,7 @@ 
         $core = $this->httpCore([CookiesMiddleware::class]);
         $core->setHandler(fn(ServerRequestInterface $r) => $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());
@@ -273,7 +273,7 @@ 
     {
         $result = [];
 
-        foreach ($response->getHeaders() as $line) {
+        foreach ($response->getHeaders() as $line){
             $cookie = explode('=', implode('', $line));
             $result[$cookie[0]] = rawurldecode(substr(
                 $cookie[1],

Braces +2 added lines, -1 removed lines

@@ -273,7 +273,8 @@
     {
         $result = [];
 
-        foreach ($response->getHeaders() as $line) {
+        foreach ($response->getHeaders() as $line)
+        {
             $cookie = explode('=', implode('', $line));
             $result[$cookie[0]] = rawurldecode(substr(
                 $cookie[1],

src/Distribution/src/Bootloader/DistributionBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         $binder->bindSingleton(DistributionInterface::class, static function (DistributionConfig $config): \Spiral\Distribution\Manager {
             $manager = new Manager($config->getDefaultDriver());
 
-            foreach ($config->getResolvers() as $name => $resolver) {
+            foreach ($config->getResolvers() as $name => $resolver){
                 $manager->add($name, $resolver);
             }
 

Braces +2 added lines, -1 removed lines

@@ -46,7 +46,8 @@
         $binder->bindSingleton(DistributionInterface::class, static function (DistributionConfig $config): \Spiral\Distribution\Manager {
             $manager = new Manager($config->getDefaultDriver());
 
-            foreach ($config->getResolvers() as $name => $resolver) {
+            foreach ($config->getResolvers() as $name => $resolver)
+            {
                 $manager->add($name, $resolver);
             }
 

src/Core/tests/Scope/FibersTest.php

Braces +13 added lines, -6 removed lines

@@ -63,7 +63,8 @@ 
         );
 
         self::assertCount(5, $result);
-        foreach ($result as $suspendValue) {
+        foreach ($result as $suspendValue)
+        {
             self::assertSame(self::TEST_DATA, $suspendValue);
         }
     }
@@ -81,7 +82,8 @@ 
         );
 
         self::assertCount(2, $result);
-        foreach ($result as $suspendValue) {
+        foreach ($result as $suspendValue)
+        {
             self::assertSame(self::TEST_DATA, $suspendValue);
         }
     }
@@ -114,9 +116,12 @@ 
                     $result = '';
                     $result .= Fiber::suspend('foo');
                     $result .= Fiber::suspend('bar');
-                    try {
+                    try
+                    {
                         $result .= Fiber::suspend('error');
-                    } catch (\Throwable $e) {
+                    }
+                    catch (\Throwable $e)
+                    {
                         $result .= $e->getMessage();
                     }
                     return $result . Fiber::suspend('baz');
@@ -150,7 +155,8 @@ 
             $c1 = $container ?? new Container();
             $c1->bindSingleton('resource', new stdClass());
 
-            $result = $c1->runScoped(static function (Container $c2) use ($load) {
+            $result = $c1->runScoped(static function (Container $c2) use ($load)
+            {
                 // check local binding
                 self::assertTrue($c2->has('foo'));
                 self::assertInstanceOf(DateTime::class, $c2->get('foo'));
@@ -163,7 +169,8 @@ 
                         $resource = $c3->get('resource');
                         self::assertInstanceOf(DateTimeImmutable::class, $c3->get('bar'));
                         self::assertInstanceOf(stdClass::class, $resource);
-                        foreach (self::TEST_DATA as $key => $value) {
+                        foreach (self::TEST_DATA as $key => $value)
+                        {
                             $resource->$key = $value;
                             $load === null or $load();
                             Fiber::suspend($value);

src/Core/tests/ScopesTest.php

Spacing +4 added lines, -4 removed lines

@@ -32,11 +32,11 @@ 
 
         $this->assertNull(ContainerScope::getContainer());
 
-        try {
+        try{
             $this->assertTrue(ContainerScope::runScope($container, static function (): never {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
         }
 
         $this->assertInstanceOf(RuntimeException::class, $e);
@@ -83,14 +83,14 @@ 
             return $c->get('bucket')->getName() == 'b' && $c->has('other');
         }));
 
-        try {
+        try{
             $this->assertTrue($c->runScope([
                 'bucket' => new Bucket('b'),
                 'other'  => new SampleClass()
             ], function () use ($c): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable) {
+        }catch (\Throwable){
         }
 
         $this->assertSame('a', $c->get('bucket')->getName());

Braces +13 added lines, -5 removed lines

@@ -32,11 +32,14 @@ 
 
         $this->assertNull(ContainerScope::getContainer());
 
-        try {
+        try
+        {
             $this->assertTrue(ContainerScope::runScope($container, static function (): never {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
         }
 
         $this->assertInstanceOf(RuntimeException::class, $e);
@@ -83,14 +86,17 @@ 
             return $c->get('bucket')->getName() == 'b' && $c->has('other');
         }));
 
-        try {
+        try
+        {
             $this->assertTrue($c->runScope([
                 'bucket' => new Bucket('b'),
                 'other'  => new SampleClass()
             ], function () use ($c): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
         }
 
         $this->assertSame('a', $c->get('bucket')->getName());
@@ -138,7 +144,9 @@ 
     public function testHasInstanceAfterMakeWithoutAliasInScope(): void
     {
         $container = new Container();
-        $container->bindSingleton('test', new #[Singleton] class {});
+        $container->bindSingleton('test', new #[Singleton] class
+        {
+});
         $container->make('test');
 
         $container->runScoped(function (Container $container): void {