spiral / framework

src/Telemetry/src/NullTracerFactory.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 {
     public function __construct(
         private readonly ?ScopeInterface $scope = new Container(),
-    ) {
+    ){
     }
 
     public function make(array $context = []): TracerInterface

src/Framework/Bootloader/Http/RoutesBootloader.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 {
     public function init(HttpBootloader $http): void
     {
-        foreach ($this->globalMiddleware() as $middleware) {
+        foreach ($this->globalMiddleware() as $middleware){
             $http->addMiddleware($middleware);
         }
     }
@@ -61,11 +61,11 @@ 
 
     private function registerMiddlewareGroups(BinderInterface $binder, array $groups): void
     {
-        foreach ($groups as $group => $middleware) {
+        foreach ($groups as $group => $middleware){
             $binder
                 ->getBinder('http')
                 ->bind(
-                    'middleware:' . $group,
+                    'middleware:'.$group,
                     static function (FactoryInterface $factory) use ($middleware): LazyPipeline {
                         return $factory->make(LazyPipeline::class)->withAddedMiddleware(...$middleware);
                     }
@@ -75,8 +75,8 @@ 
 
     private function registerMiddlewareForRouteGroups(GroupRegistry $registry, array $groups): void
     {
-        foreach ($groups as $group) {
-            $registry->getGroup($group)->addMiddleware('middleware:' . $group);
+        foreach ($groups as $group){
+            $registry->getGroup($group)->addMiddleware('middleware:'.$group);
         }
     }
 }

Braces +6 added lines, -3 removed lines

@@ -19,7 +19,8 @@ 
 {
     public function init(HttpBootloader $http): void
     {
-        foreach ($this->globalMiddleware() as $middleware) {
+        foreach ($this->globalMiddleware() as $middleware)
+        {
             $http->addMiddleware($middleware);
         }
     }
@@ -61,7 +62,8 @@ 
 
     private function registerMiddlewareGroups(BinderInterface $binder, array $groups): void
     {
-        foreach ($groups as $group => $middleware) {
+        foreach ($groups as $group => $middleware)
+        {
             $binder
                 ->getBinder('http')
                 ->bind(
@@ -75,7 +77,8 @@ 
 
     private function registerMiddlewareForRouteGroups(GroupRegistry $registry, array $groups): void
     {
-        foreach ($groups as $group) {
+        foreach ($groups as $group)
+        {
             $registry->getGroup($group)->addMiddleware('middleware:' . $group);
         }
     }

src/Http/src/LazyPipeline.php

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
     public function __construct(
         #[Proxy] private readonly ContainerInterface $container,
         private readonly ?EventDispatcherInterface $dispatcher = null,
-    ) {
+    ){
     }
 
     /**
@@ -47,7 +47,7 @@ 
      *
      * @param MiddlewareInterface ...$middleware List of middleware or its definition.
      */
-    public function withAddedMiddleware(MiddlewareInterface|Autowire|string ...$middleware): self
+    public function withAddedMiddleware(MiddlewareInterface | Autowire | string ...$middleware): self
     {
         $pipeline = clone $this;
         $pipeline->middleware = \array_merge($pipeline->middleware, $middleware);
@@ -59,7 +59,7 @@ 
      *
      * @param MiddlewareInterface ...$middleware List of middleware or its definition.
      */
-    public function withMiddleware(MiddlewareInterface|Autowire|string ...$middleware): self
+    public function withMiddleware(MiddlewareInterface | Autowire | string ...$middleware): self
     {
         $pipeline = clone $this;
         $pipeline->middleware = $middleware;
@@ -92,9 +92,9 @@ 
 
         $previousRequest = $currentRequest->get();
         $currentRequest->set($request);
-        try {
+        try{
             // There is no middleware to process, let's pass the request to the handler
-            if (!\array_key_exists($this->position, $this->middleware)) {
+            if (!\array_key_exists($this->position, $this->middleware)){
                 return $this->handler->handle($request);
             }
 
@@ -108,7 +108,7 @@ 
                 ? \sprintf('%s=%s', $this->middleware[$this->position], $middleware::class)
                 : $middleware::class;
             // Init a tracing span when the pipeline starts
-            if ($span === null) {
+            if ($span === null){
                 /** @var TracerInterface $tracer */
                 $tracer = $this->container->get(TracerInterface::class);
                 return $tracer->trace(
@@ -126,7 +126,7 @@ 
             $span->setAttribute('http.middleware', $middlewares);
 
             return $middleware->process($request, $this->next($span));
-        } finally {
+        }finally{
             $currentRequest->set($previousRequest);
         }
     }

Braces +9 added lines, -4 removed lines

@@ -92,9 +92,11 @@ 
 
         $previousRequest = $currentRequest->get();
         $currentRequest->set($request);
-        try {
+        try
+        {
             // There is no middleware to process, let's pass the request to the handler
-            if (!\array_key_exists($this->position, $this->middleware)) {
+            if (!\array_key_exists($this->position, $this->middleware))
+            {
                 return $this->handler->handle($request);
             }
 
@@ -108,7 +110,8 @@ 
                 ? \sprintf('%s=%s', $this->middleware[$this->position], $middleware::class)
                 : $middleware::class;
             // Init a tracing span when the pipeline starts
-            if ($span === null) {
+            if ($span === null)
+            {
                 /** @var TracerInterface $tracer */
                 $tracer = $this->container->get(TracerInterface::class);
                 return $tracer->trace(
@@ -126,7 +129,9 @@ 
             $span->setAttribute('http.middleware', $middlewares);
 
             return $middleware->process($request, $this->next($span));
-        } finally {
+        }
+        finally
+        {
             $currentRequest->set($previousRequest);
         }
     }

src/Http/src/Pipeline.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
         #[Proxy] ScopeInterface $scope,
         private readonly ?EventDispatcherInterface $dispatcher = null,
         ?TracerInterface $tracer = null
-    ) {
+    ){
         $this->tracer = $tracer ?? new NullTracer($scope);
     }
 
@@ -60,7 +60,7 @@ 
 
     public function handle(Request $request): Response
     {
-        if ($this->handler === null) {
+        if ($this->handler === null){
             throw new PipelineException('Unable to run pipeline, no handler given.');
         }
 
@@ -70,9 +70,9 @@ 
 
         $previousRequest = $currentRequest?->get();
         $currentRequest?->set($request);
-        try {
+        try{
             $position = $this->position++;
-            if (!isset($this->middleware[$position])) {
+            if (!isset($this->middleware[$position])){
                 return $this->handler->handle($request);
             }
 
@@ -104,8 +104,8 @@ 
                 ],
                 scoped: true
             );
-        } finally {
-            if ($previousRequest !== null) {
+        }finally{
+            if ($previousRequest !== null){
                 $currentRequest?->set($previousRequest);
             }
         }

src/Http/src/Http.php

Spacing +11 added lines, -11 removed lines

@@ -25,21 +25,21 @@ 
 {
     private ?RequestHandlerInterface $handler = null;
     private readonly TracerFactoryInterface $tracerFactory;
-    private readonly Pipeline|LazyPipeline $pipeline;
+    private readonly Pipeline | LazyPipeline $pipeline;
 
     public function __construct(
         private readonly HttpConfig $config,
-        Pipeline|LazyPipeline $pipeline,
+        Pipeline | LazyPipeline $pipeline,
         private readonly ResponseFactoryInterface $responseFactory,
         private readonly ContainerInterface $container,
         ?TracerFactoryInterface $tracerFactory = null,
         private readonly ?EventDispatcherInterface $dispatcher = null,
-    ) {
-        if ($pipeline instanceof Pipeline) {
-            foreach ($this->config->getMiddleware() as $middleware) {
+    ){
+        if ($pipeline instanceof Pipeline){
+            foreach ($this->config->getMiddleware() as $middleware){
                 $pipeline->pushMiddleware($this->container->get($middleware));
             }
-        } else {
+        }else{
             $pipeline = $pipeline->withAddedMiddleware(
                 ...$this->config->getMiddleware()
             );
@@ -53,12 +53,12 @@ 
     /**
      * @internal
      */
-    public function getPipeline(): Pipeline|LazyPipeline
+    public function getPipeline(): Pipeline | LazyPipeline
     {
         return $this->pipeline;
     }
 
-    public function setHandler(callable|RequestHandlerInterface $handler): self
+    public function setHandler(callable | RequestHandlerInterface $handler): self
     {
         $this->handler = $handler instanceof RequestHandlerInterface
             ? $handler
@@ -77,7 +77,7 @@ 
 
             $this->dispatcher?->dispatch(new RequestReceived($request));
 
-            if ($this->handler === null) {
+            if ($this->handler === null){
                 throw new HttpException('Unable to run HttpCore, no handler is set.');
             }
 
@@ -107,7 +107,7 @@ 
             callback: $callback,
             attributes: [
                 'http.method' => $request->getMethod(),
-                'http.url' => (string) $request->getUri(),
+                'http.url' => (string)$request->getUri(),
                 'http.headers' => \array_map(
                     static fn (array $values): string => \implode(',', $values),
                     $request->getHeaders(),
@@ -117,7 +117,7 @@ 
             traceKind: TraceKind::SERVER,
         );
 
-        foreach ($tracer->getContext() as $key => $value) {
+        foreach ($tracer->getContext() as $key => $value){
             $response = $response->withHeader($key, $value);
         }
 

Braces +11 added lines, -5 removed lines

@@ -35,11 +35,15 @@ 
         ?TracerFactoryInterface $tracerFactory = null,
         private readonly ?EventDispatcherInterface $dispatcher = null,
     ) {
-        if ($pipeline instanceof Pipeline) {
-            foreach ($this->config->getMiddleware() as $middleware) {
+        if ($pipeline instanceof Pipeline)
+        {
+            foreach ($this->config->getMiddleware() as $middleware)
+            {
                 $pipeline->pushMiddleware($this->container->get($middleware));
             }
-        } else {
+        }
+        else
+        {
             $pipeline = $pipeline->withAddedMiddleware(
                 ...$this->config->getMiddleware()
             );
@@ -77,7 +81,8 @@ 
 
             $this->dispatcher?->dispatch(new RequestReceived($request));
 
-            if ($this->handler === null) {
+            if ($this->handler === null)
+            {
                 throw new HttpException('Unable to run HttpCore, no handler is set.');
             }
 
@@ -117,7 +122,8 @@ 
             traceKind: TraceKind::SERVER,
         );
 
-        foreach ($tracer->getContext() as $key => $value) {
+        foreach ($tracer->getContext() as $key => $value)
+        {
             $response = $response->withHeader($key, $value);
         }
 

src/Router/tests/RouterTest.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         $dispatcher
             ->expects(self::exactly(2))
             ->method('dispatch')
-            ->with($this->callback(static fn (Routing|RouteMatched $event): bool => $event->request instanceof ServerRequest));
+            ->with($this->callback(static fn (Routing | RouteMatched $event): bool => $event->request instanceof ServerRequest));
 
         $router = $this->makeRouter('', $dispatcher);
         $router->setDefault($route);
@@ -90,7 +90,7 @@ 
         $router->import($configurator);
         $this->getContainer()->get(GroupRegistry::class)->registerRoutes($router);
 
-        $uri = (string) $router->uri('foo', ['host' => 'some']);
+        $uri = (string)$router->uri('foo', ['host' => 'some']);
         $this->assertSame('some/register', $uri);
         $this->assertFalse(\str_contains('https://host.com', $uri));
     }

src/Router/src/CoreHandler.php

Spacing +23 added lines, -23 removed lines

@@ -46,11 +46,11 @@ 
     private bool $isLegacyPipeline;
 
     public function __construct(
-        private readonly HandlerInterface|CoreInterface $core,
+        private readonly HandlerInterface | CoreInterface $core,
         private readonly ScopeInterface $scope,
         private readonly ResponseFactoryInterface $responseFactory,
         ?TracerInterface $tracer = null
-    ) {
+    ){
         $this->tracer = $tracer ?? new NullTracer($scope);
         $this->isLegacyPipeline = !$core instanceof HandlerInterface;
     }
@@ -98,9 +98,9 @@ 
         $output = '';
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try{
             $action = $this->verbActions
-                ? \strtolower($request->getMethod()) . \ucfirst($this->action)
+                ? \strtolower($request->getMethod()).\ucfirst($this->action)
                 : $this->action;
 
             // run the core withing PSR-7 Request/Response scope
@@ -114,14 +114,14 @@ 
                     bindings: [Request::class => $request, Response::class => $response, $controller => $controller],
                 ),
                 fn (): mixed => $this->tracer->trace(
-                    name: 'Controller [' . $controller . ':' . $action . ']',
+                    name: 'Controller ['.$controller.':'.$action.']',
                     callback: $this->isLegacyPipeline
-                        ? fn (): mixed => $this->core->callAction(
-                            controller: $controller,
-                            action: $action,
-                            parameters: $parameters,
+                        ? fn () : mixed => $this->core->callAction(
+                            controller : $controller,
+                            action : $action,
+                            parameters : $parameters,
                         )
-                        : fn (): mixed => $this->core->handle(
+                        : fn () : mixed => $this->core->handle(
                             new CallContext(
                                 Target::fromPair($controller, $action),
                                 $parameters,
@@ -130,29 +130,29 @@ 
                                 ],
                             ),
                         ),
-                    attributes: [
+                    attributes : [
                         'route.controller' => $this->controller,
                         'route.action' => $action,
                         'route.parameters' => \array_keys($parameters),
                     ]
                 )
             );
-        } catch (TargetCallException $e) {
+        }catch (TargetCallException $e){
             \ob_get_clean();
             throw $this->mapException($e);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             \ob_get_clean();
             throw $e;
-        } finally {
-            while (\ob_get_level() > $outputLevel + 1) {
-                $output = \ob_get_clean() . $output;
+        }finally{
+            while (\ob_get_level() > $outputLevel + 1){
+                $output = \ob_get_clean().$output;
             }
         }
 
         return $this->wrapResponse(
             $response,
             $result,
-            \ob_get_clean() . $output,
+            \ob_get_clean().$output,
         );
     }
 
@@ -165,21 +165,21 @@ 
      */
     private function wrapResponse(Response $response, mixed $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if ($output !== '' && $result->getBody()->isWritable()) {
+        if ($result instanceof Response){
+            if ($output !== '' && $result->getBody()->isWritable()){
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if ($result instanceof \Generator) {
+        if ($result instanceof \Generator){
             return $response->withBody(new GeneratorStream($result));
         }
 
-        if (\is_array($result) || $result instanceof \JsonSerializable) {
+        if (\is_array($result) || $result instanceof \JsonSerializable){
             $response = $this->writeJson($response, $result);
-        } else {
+        }else{
             $response->getBody()->write((string)$result);
         }
 
@@ -212,7 +212,7 @@ 
      */
     private function checkValues(): void
     {
-        if ($this->controller === null) {
+        if ($this->controller === null){
             throw new HandlerException('Controller and action pair are not set.');
         }
     }

src/Router/src/Traits/PipelineTrait.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 {
     use ContainerTrait;
 
-    protected Pipeline|LazyPipeline|null $pipeline = null;
+    protected Pipeline | LazyPipeline | null $pipeline = null;
 
     /** @psalm-var array<array-key, MiddlewareType> */
     protected array $middleware = [];
@@ -44,16 +44,16 @@ 
         $route = clone $this;
 
         // array fallback
-        if (\count($middleware) === 1 && \is_array($middleware[0])) {
+        if (\count($middleware) === 1 && \is_array($middleware[0])){
             $middleware = $middleware[0];
         }
 
         /** @var MiddlewareType[] $middleware */
-        foreach ($middleware as $item) {
+        foreach ($middleware as $item){
             $route->middleware[] = $item;
         }
 
-        if ($route->pipeline !== null) {
+        if ($route->pipeline !== null){
             $route->pipeline = $route->makeLazyPipeline();
         }
 
@@ -80,11 +80,11 @@ 
     protected function makePipeline(): Pipeline
     {
         \assert($this->container !== null);
-        try {
+        try{
             return $this->container
                 ->get(PipelineFactory::class)
                 ->createWithMiddleware($this->middleware);
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -97,11 +97,11 @@ 
     protected function makeLazyPipeline(): LazyPipeline
     {
         \assert($this->container !== null);
-        try {
+        try{
             /** @var LazyPipeline $pipeline */
             $pipeline = $this->container->get(LazyPipeline::class);
             return $pipeline->withMiddleware(...$this->middleware);
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }

Braces +16 added lines, -7 removed lines

@@ -44,16 +44,19 @@ 
         $route = clone $this;
 
         // array fallback
-        if (\count($middleware) === 1 && \is_array($middleware[0])) {
+        if (\count($middleware) === 1 && \is_array($middleware[0]))
+        {
             $middleware = $middleware[0];
         }
 
         /** @var MiddlewareType[] $middleware */
-        foreach ($middleware as $item) {
+        foreach ($middleware as $item)
+        {
             $route->middleware[] = $item;
         }
 
-        if ($route->pipeline !== null) {
+        if ($route->pipeline !== null)
+        {
             $route->pipeline = $route->makeLazyPipeline();
         }
 
@@ -80,11 +83,14 @@ 
     protected function makePipeline(): Pipeline
     {
         \assert($this->container !== null);
-        try {
+        try
+        {
             return $this->container
                 ->get(PipelineFactory::class)
                 ->createWithMiddleware($this->middleware);
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -97,11 +103,14 @@ 
     protected function makeLazyPipeline(): LazyPipeline
     {
         \assert($this->container !== null);
-        try {
+        try
+        {
             /** @var LazyPipeline $pipeline */
             $pipeline = $this->container->get(LazyPipeline::class);
             return $pipeline->withMiddleware(...$this->middleware);
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }

src/Router/src/Route.php

Spacing +12 added lines, -12 removed lines

@@ -51,9 +51,9 @@ 
      */
     public function __construct(
         string $pattern,
-        string|callable|RequestHandlerInterface|TargetInterface $target,
+        string | callable | RequestHandlerInterface | TargetInterface $target,
         array $defaults = []
-    ) {
+    ){
         parent::__construct(
             $pattern,
             $target instanceof TargetInterface
@@ -69,7 +69,7 @@ 
      */
     public function withUriHandler(UriHandler $uriHandler): static
     {
-        if ($this->target instanceof TargetInterface) {
+        if ($this->target instanceof TargetInterface){
             $uriHandler = $uriHandler->withConstrains(
                 $this->target->getConstrains(),
                 $this->defaults,
@@ -87,7 +87,7 @@ 
         $route = clone $this;
         $route->container = $container;
 
-        if ($route->target instanceof TargetInterface) {
+        if ($route->target instanceof TargetInterface){
             $route->target = clone $route->target;
         }
 
@@ -114,7 +114,7 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->requestHandler)) {
+        if (empty($this->requestHandler)){
             $this->requestHandler = $this->requestHandler();
         }
 
@@ -134,25 +134,25 @@ 
             'Unable to configure route pipeline without associated container.',
         );
 
-        if ($this->target instanceof TargetInterface) {
-            try {
+        if ($this->target instanceof TargetInterface){
+            try{
                 \assert($this->matches !== null);
                 return $this->target->getHandler($this->container, $this->matches);
-            } catch (TargetException $e) {
+            }catch (TargetException $e){
                 throw new RouteException('Invalid target resolution', $e->getCode(), $e);
             }
         }
 
-        if ($this->target instanceof RequestHandlerInterface) {
+        if ($this->target instanceof RequestHandlerInterface){
             return $this->target;
         }
 
-        try {
+        try{
             $target = \is_string($this->target)
                 ? $this->container->get($this->target)
                 : $this->target;
 
-            if ($target instanceof RequestHandlerInterface) {
+            if ($target instanceof RequestHandlerInterface){
                 return $target;
             }
 
@@ -160,7 +160,7 @@ 
                 $target,
                 $this->container->get(ResponseFactoryInterface::class)
             );
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }

Braces +22 added lines, -10 removed lines

@@ -69,7 +69,8 @@ 
      */
     public function withUriHandler(UriHandler $uriHandler): static
     {
-        if ($this->target instanceof TargetInterface) {
+        if ($this->target instanceof TargetInterface)
+        {
             $uriHandler = $uriHandler->withConstrains(
                 $this->target->getConstrains(),
                 $this->defaults,
@@ -87,7 +88,8 @@ 
         $route = clone $this;
         $route->container = $container;
 
-        if ($route->target instanceof TargetInterface) {
+        if ($route->target instanceof TargetInterface)
+        {
             $route->target = clone $route->target;
         }
 
@@ -114,7 +116,8 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->requestHandler)) {
+        if (empty($this->requestHandler))
+        {
             $this->requestHandler = $this->requestHandler();
         }
 
@@ -134,25 +137,32 @@ 
             'Unable to configure route pipeline without associated container.',
         );
 
-        if ($this->target instanceof TargetInterface) {
-            try {
+        if ($this->target instanceof TargetInterface)
+        {
+            try
+            {
                 \assert($this->matches !== null);
                 return $this->target->getHandler($this->container, $this->matches);
-            } catch (TargetException $e) {
+            }
+            catch (TargetException $e)
+            {
                 throw new RouteException('Invalid target resolution', $e->getCode(), $e);
             }
         }
 
-        if ($this->target instanceof RequestHandlerInterface) {
+        if ($this->target instanceof RequestHandlerInterface)
+        {
             return $this->target;
         }
 
-        try {
+        try
+        {
             $target = \is_string($this->target)
                 ? $this->container->get($this->target)
                 : $this->target;
 
-            if ($target instanceof RequestHandlerInterface) {
+            if ($target instanceof RequestHandlerInterface)
+            {
                 return $target;
             }
 
@@ -160,7 +170,9 @@ 
                 $target,
                 $this->container->get(ResponseFactoryInterface::class)
             );
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new RouteException($e->getMessage(), $e->getCode(), $e);
         }
     }