spiral / framework

src/Http/src/CallableHandler.php

Spacing +10 added lines, -10 removed lines

@@ -51,21 +51,21 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try{
             $result = ($this->callable)($request, $response);
-        } 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
         );
     }
 
@@ -80,17 +80,17 @@ 
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if (!empty($output) && $result->getBody()->isWritable()) {
+        if ($result instanceof Response){
+            if (!empty($output) && $result->getBody()->isWritable()){
                 $result->getBody()->write($output);
             }
 
             return $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);
         }
 

Braces +19 added lines, -8 removed lines

@@ -51,13 +51,19 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try
+        {
             $result = ($this->callable)($request, $response);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             ob_get_clean();
             throw $e;
-        } finally {
-            while (ob_get_level() > $outputLevel + 1) {
+        }
+        finally
+        {
+            while (ob_get_level() > $outputLevel + 1)
+            {
                 $output = ob_get_clean() . $output;
             }
         }
@@ -80,17 +86,22 @@ 
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if (!empty($output) && $result->getBody()->isWritable()) {
+        if ($result instanceof Response)
+        {
+            if (!empty($output) && $result->getBody()->isWritable())
+            {
                 $result->getBody()->write($output);
             }
 
             return $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);
         }
 

src/Http/src/Http.php

Spacing +6 added lines, -6 removed lines

@@ -47,13 +47,13 @@ 
         Pipeline $pipeline,
         ResponseFactoryInterface $responseFactory,
         ContainerInterface $container
-    ) {
+    ){
         $this->config = $config;
         $this->pipeline = $pipeline;
         $this->responseFactory = $responseFactory;
         $this->container = $container;
 
-        foreach ($this->config->getMiddleware() as $middleware) {
+        foreach ($this->config->getMiddleware() as $middleware){
             $this->pipeline->pushMiddleware($this->container->get($middleware));
         }
     }
@@ -72,11 +72,11 @@ 
      */
     public function setHandler($handler): self
     {
-        if ($handler instanceof RequestHandlerInterface) {
+        if ($handler instanceof RequestHandlerInterface){
             $this->handler = $handler;
-        } elseif (is_callable($handler)) {
+        } elseif (is_callable($handler)){
             $this->handler = new CallableHandler($handler, $this->responseFactory);
-        } else {
+        }else{
             throw new HttpException(
                 'Invalid handler is given, expects callable or RequestHandlerInterface.'
             );
@@ -93,7 +93,7 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->handler)) {
+        if (empty($this->handler)){
             throw new HttpException('Unable to run HttpCore, no handler is set.');
         }
 

Braces +12 added lines, -5 removed lines

@@ -53,7 +53,8 @@ 
         $this->responseFactory = $responseFactory;
         $this->container = $container;
 
-        foreach ($this->config->getMiddleware() as $middleware) {
+        foreach ($this->config->getMiddleware() as $middleware)
+        {
             $this->pipeline->pushMiddleware($this->container->get($middleware));
         }
     }
@@ -72,11 +73,16 @@ 
      */
     public function setHandler($handler): self
     {
-        if ($handler instanceof RequestHandlerInterface) {
+        if ($handler instanceof RequestHandlerInterface)
+        {
             $this->handler = $handler;
-        } elseif (is_callable($handler)) {
+        }
+        elseif (is_callable($handler))
+        {
             $this->handler = new CallableHandler($handler, $this->responseFactory);
-        } else {
+        }
+        else
+        {
             throw new HttpException(
                 'Invalid handler is given, expects callable or RequestHandlerInterface.'
             );
@@ -93,7 +99,8 @@ 
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if (empty($this->handler)) {
+        if (empty($this->handler))
+        {
             throw new HttpException('Unable to run HttpCore, no handler is set.');
         }
 

src/Http/src/Emitter/SapiEmitter.php

Spacing +5 added lines, -5 removed lines

@@ -67,11 +67,11 @@ 
      */
     private function assertNoPreviousOutput(): void
     {
-        if (headers_sent()) {
+        if (headers_sent()){
             throw new EmitterException('Unable to emit response, headers already send.');
         }
 
-        if (ob_get_level() > 0 && ob_get_length() > 0) {
+        if (ob_get_level() > 0 && ob_get_length() > 0){
             throw new EmitterException('Unable to emit response, found non closed buffered output.');
         }
     }
@@ -97,7 +97,7 @@ 
             'HTTP/%s %d%s',
             $response->getProtocolVersion(),
             $statusCode,
-            ($reasonPhrase ? ' ' . $reasonPhrase : '')
+            ($reasonPhrase ? ' '.$reasonPhrase : '')
         ), true, $statusCode);
     }
 
@@ -115,10 +115,10 @@ 
     {
         $statusCode = $response->getStatusCode();
 
-        foreach ($response->getHeaders() as $header => $values) {
+        foreach ($response->getHeaders() as $header => $values){
             $name = $this->filterHeader($header);
             $first = $name === 'Set-Cookie' ? false : true;
-            foreach ($values as $value) {
+            foreach ($values as $value){
                 header(sprintf(
                     '%s: %s',
                     $name,

Braces +8 added lines, -4 removed lines

@@ -67,11 +67,13 @@ 
      */
     private function assertNoPreviousOutput(): void
     {
-        if (headers_sent()) {
+        if (headers_sent())
+        {
             throw new EmitterException('Unable to emit response, headers already send.');
         }
 
-        if (ob_get_level() > 0 && ob_get_length() > 0) {
+        if (ob_get_level() > 0 && ob_get_length() > 0)
+        {
             throw new EmitterException('Unable to emit response, found non closed buffered output.');
         }
     }
@@ -115,10 +117,12 @@ 
     {
         $statusCode = $response->getStatusCode();
 
-        foreach ($response->getHeaders() as $header => $values) {
+        foreach ($response->getHeaders() as $header => $values)
+        {
             $name = $this->filterHeader($header);
             $first = $name === 'Set-Cookie' ? false : true;
-            foreach ($values as $value) {
+            foreach ($values as $value)
+            {
                 header(sprintf(
                     '%s: %s',
                     $name,

src/Http/src/Pipeline.php

Spacing +2 added lines, -2 removed lines

@@ -73,12 +73,12 @@
      */
     public function handle(Request $request): Response
     {
-        if (empty($this->handler)) {
+        if (empty($this->handler)){
             throw new PipelineException('Unable to run pipeline, no handler given.');
         }
 
         $position = $this->position++;
-        if (isset($this->middleware[$position])) {
+        if (isset($this->middleware[$position])){
             return $this->middleware[$position]->process($request, $this);
         }
 

Braces +6 added lines, -3 removed lines

@@ -73,16 +73,19 @@
      */
     public function handle(Request $request): Response
     {
-        if (empty($this->handler)) {
+        if (empty($this->handler))
+        {
             throw new PipelineException('Unable to run pipeline, no handler given.');
         }
 
         $position = $this->position++;
-        if (isset($this->middleware[$position])) {
+        if (isset($this->middleware[$position]))
+        {
             return $this->middleware[$position]->process($request, $this);
         }
 
-        return $this->scope->runScope([Request::class => $request], function () use ($request) {
+        return $this->scope->runScope([Request::class => $request], function () use ($request)
+        {
             return $this->handler->handle($request);
         });
     }

src/Http/src/Exception/ClientException.php

Spacing +2 added lines, -2 removed lines

@@ -34,11 +34,11 @@
      */
     public function __construct(?int $code = null, string $message = '', ?\Throwable $previous = null)
     {
-        if (empty($code) && empty($this->code)) {
+        if (empty($code) && empty($this->code)){
             $code = self::BAD_DATA;
         }
 
-        if (empty($message)) {
+        if (empty($message)){
             $message = "Http Error - {$code}";
         }
 

Braces +4 added lines, -2 removed lines

@@ -34,11 +34,13 @@
      */
     public function __construct(?int $code = null, string $message = '', ?\Throwable $previous = null)
     {
-        if (empty($code) && empty($this->code)) {
+        if (empty($code) && empty($this->code))
+        {
             $code = self::BAD_DATA;
         }
 
-        if (empty($message)) {
+        if (empty($message))
+        {
             $message = "Http Error - {$code}";
         }
 

src/Http/src/Request/FilesBag.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      */
     public function getFilename(string $name): ?string
     {
-        if (!empty($file = $this->get($name)) && !$file->getError()) {
+        if (!empty($file = $this->get($name)) && !$file->getError()){
             return StreamWrapper::getFilename($file->getStream());
         }
 

Braces +2 added lines, -1 removed lines

@@ -32,7 +32,8 @@
      */
     public function getFilename(string $name): ?string
     {
-        if (!empty($file = $this->get($name)) && !$file->getError()) {
+        if (!empty($file = $this->get($name)) && !$file->getError())
+        {
             return StreamWrapper::getFilename($file->getStream());
         }
 

src/Http/src/Request/InputManager.php

Spacing +17 added lines, -17 removed lines

@@ -143,10 +143,10 @@ 
     {
         $input = clone $this;
 
-        if ($add) {
-            $input->prefix .= '.' . $prefix;
+        if ($add){
+            $input->prefix .= '.'.$prefix;
             $input->prefix = trim($input->prefix, '.');
-        } else {
+        }else{
             $input->prefix = $prefix;
         }
 
@@ -162,12 +162,12 @@ 
     {
         $path = $this->uri()->getPath();
 
-        if (empty($path)) {
+        if (empty($path)){
             return '/';
         }
 
-        if ($path[0] !== '/') {
-            return '/' . $path;
+        if ($path[0] !== '/'){
+            return '/'.$path;
         }
 
         return $path;
@@ -192,9 +192,9 @@ 
      */
     public function request(): Request
     {
-        try {
+        try{
             $request = $this->container->get(Request::class);
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw new ScopeException(
                 'Unable to get `ServerRequestInterface` in active container scope',
                 $e->getCode(),
@@ -203,7 +203,7 @@ 
         }
 
         //Flushing input state
-        if ($this->request !== $request) {
+        if ($this->request !== $request){
             $this->bags = [];
             $this->request = $request;
         }
@@ -265,16 +265,16 @@ 
     public function isJsonExpected(bool $softMatch = false): bool
     {
         $acceptHeader = AcceptHeader::fromString($this->request()->getHeaderLine('Accept'));
-        foreach ($this->jsonTypes as $jsonType) {
-            if ($acceptHeader->has($jsonType)) {
+        foreach ($this->jsonTypes as $jsonType){
+            if ($acceptHeader->has($jsonType)){
                 return true;
             }
         }
 
-        if ($softMatch) {
-            foreach ($acceptHeader->getAll() as $item) {
+        if ($softMatch){
+            foreach ($acceptHeader->getAll() as $item){
                 $itemValue = strtolower($item->getValue());
-                if (str_ends_with($itemValue, '/json') || str_ends_with($itemValue, '+json')) {
+                if (str_ends_with($itemValue, '/json') || str_ends_with($itemValue, '+json')){
                     return true;
                 }
             }
@@ -321,18 +321,18 @@ 
         // ensure proper request association
         $this->request();
 
-        if (isset($this->bags[$name])) {
+        if (isset($this->bags[$name])){
             return $this->bags[$name];
         }
 
-        if (!isset($this->bagAssociations[$name])) {
+        if (!isset($this->bagAssociations[$name])){
             throw new InputException("Undefined input bag '{$name}'");
         }
 
         $class = $this->bagAssociations[$name]['class'];
         $data = call_user_func([$this->request(), $this->bagAssociations[$name]['source']]);
 
-        if (!is_array($data)) {
+        if (!is_array($data)){
             $data = (array)$data;
         }
 

Braces +32 added lines, -15 removed lines

@@ -143,10 +143,13 @@ 
     {
         $input = clone $this;
 
-        if ($add) {
+        if ($add)
+        {
             $input->prefix .= '.' . $prefix;
             $input->prefix = trim($input->prefix, '.');
-        } else {
+        }
+        else
+        {
             $input->prefix = $prefix;
         }
 
@@ -162,11 +165,13 @@ 
     {
         $path = $this->uri()->getPath();
 
-        if (empty($path)) {
+        if (empty($path))
+        {
             return '/';
         }
 
-        if ($path[0] !== '/') {
+        if ($path[0] !== '/')
+        {
             return '/' . $path;
         }
 
@@ -192,9 +197,12 @@ 
      */
     public function request(): Request
     {
-        try {
+        try
+        {
             $request = $this->container->get(Request::class);
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw new ScopeException(
                 'Unable to get `ServerRequestInterface` in active container scope',
                 $e->getCode(),
@@ -203,7 +211,8 @@ 
         }
 
         //Flushing input state
-        if ($this->request !== $request) {
+        if ($this->request !== $request)
+        {
             $this->bags = [];
             $this->request = $request;
         }
@@ -265,16 +274,21 @@ 
     public function isJsonExpected(bool $softMatch = false): bool
     {
         $acceptHeader = AcceptHeader::fromString($this->request()->getHeaderLine('Accept'));
-        foreach ($this->jsonTypes as $jsonType) {
-            if ($acceptHeader->has($jsonType)) {
+        foreach ($this->jsonTypes as $jsonType)
+        {
+            if ($acceptHeader->has($jsonType))
+            {
                 return true;
             }
         }
 
-        if ($softMatch) {
-            foreach ($acceptHeader->getAll() as $item) {
+        if ($softMatch)
+        {
+            foreach ($acceptHeader->getAll() as $item)
+            {
                 $itemValue = strtolower($item->getValue());
-                if (str_ends_with($itemValue, '/json') || str_ends_with($itemValue, '+json')) {
+                if (str_ends_with($itemValue, '/json') || str_ends_with($itemValue, '+json'))
+                {
                     return true;
                 }
             }
@@ -321,18 +335,21 @@ 
         // ensure proper request association
         $this->request();
 
-        if (isset($this->bags[$name])) {
+        if (isset($this->bags[$name]))
+        {
             return $this->bags[$name];
         }
 
-        if (!isset($this->bagAssociations[$name])) {
+        if (!isset($this->bagAssociations[$name]))
+        {
             throw new InputException("Undefined input bag '{$name}'");
         }
 
         $class = $this->bagAssociations[$name]['class'];
         $data = call_user_func([$this->request(), $this->bagAssociations[$name]['source']]);
 
-        if (!is_array($data)) {
+        if (!is_array($data))
+        {
             $data = (array)$data;
         }
 

src/Http/src/Request/HeadersBag.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
     {
         $value = parent::get($this->normalize($name), $default);
 
-        if (!empty($implode) && is_array($value)) {
+        if (!empty($implode) && is_array($value)){
             return implode($implode, $value);
         }
 
@@ -55,8 +55,8 @@ 
 
         $values = parent::fetch($keys, $fill, $filler);
 
-        if (!empty($implode)) {
-            foreach ($values as &$value) {
+        if (!empty($implode)){
+            foreach ($values as &$value){
                 $value = implode($implode, $value);
                 unset($value);
             }

Braces +6 added lines, -3 removed lines

@@ -37,7 +37,8 @@ 
     {
         $value = parent::get($this->normalize($name), $default);
 
-        if (!empty($implode) && is_array($value)) {
+        if (!empty($implode) && is_array($value))
+        {
             return implode($implode, $value);
         }
 
@@ -55,8 +56,10 @@ 
 
         $values = parent::fetch($keys, $fill, $filler);
 
-        if (!empty($implode)) {
-            foreach ($values as &$value) {
+        if (!empty($implode))
+        {
+            foreach ($values as &$value)
+            {
                 $value = implode($implode, $value);
                 unset($value);
             }

Indentation -1 removed lines

@@ -30,7 +30,6 @@
      *
      *
      * @param bool|string $implode Implode header lines, false to return header as array.
-
      * @return string|array
      */
     public function get(string $name, $default = null, $implode = ',')

src/Http/src/ResponseWrapper.php

Spacing +9 added lines, -9 removed lines

@@ -46,7 +46,7 @@ 
         ResponseFactoryInterface $responseFactory,
         StreamFactoryInterface $streamFactory,
         FilesInterface $files
-    ) {
+    ){
         $this->responseFactory = $responseFactory;
         $this->streamFactory = $streamFactory;
         $this->files = $files;
@@ -72,7 +72,7 @@ 
      */
     public function redirect($uri, int $code = 302): ResponseInterface
     {
-        if (!is_string($uri) && !$uri instanceof UriInterface) {
+        if (!is_string($uri) && !$uri instanceof UriInterface){
             throw new ResponseException('Redirect allowed only for string or UriInterface uris');
         }
 
@@ -108,8 +108,8 @@ 
         string $name = '',
         string $mime = 'application/octet-stream'
     ): ResponseInterface {
-        if (empty($name)) {
-            if (!is_string($filename)) {
+        if (empty($name)){
+            if (!is_string($filename)){
                 throw new ResponseException('Unable to resolve public filename');
             }
 
@@ -123,7 +123,7 @@ 
         $response = $response->withHeader('Content-Length', (string)$stream->getSize());
         $response = $response->withHeader(
             'Content-Disposition',
-            'attachment; filename="' . addcslashes($name, '"') . '"'
+            'attachment; filename="'.addcslashes($name, '"').'"'
         );
 
         return $response->withBody($stream);
@@ -156,19 +156,19 @@ 
      */
     private function getStream($file): StreamInterface
     {
-        if ($file instanceof StreamableInterface) {
+        if ($file instanceof StreamableInterface){
             return $file->getStream();
         }
 
-        if ($file instanceof StreamInterface) {
+        if ($file instanceof StreamInterface){
             return $file;
         }
 
-        if (is_resource($file)) {
+        if (is_resource($file)){
             return $this->streamFactory->createStreamFromResource($file);
         }
 
-        if (!$this->files->isFile($file)) {
+        if (!$this->files->isFile($file)){
             throw new ResponseException('Unable to allocate response body stream, file does not exist');
         }
 

Braces +14 added lines, -7 removed lines

@@ -72,7 +72,8 @@ 
      */
     public function redirect($uri, int $code = 302): ResponseInterface
     {
-        if (!is_string($uri) && !$uri instanceof UriInterface) {
+        if (!is_string($uri) && !$uri instanceof UriInterface)
+        {
             throw new ResponseException('Redirect allowed only for string or UriInterface uris');
         }
 
@@ -108,8 +109,10 @@ 
         string $name = '',
         string $mime = 'application/octet-stream'
     ): ResponseInterface {
-        if (empty($name)) {
-            if (!is_string($filename)) {
+        if (empty($name))
+        {
+            if (!is_string($filename))
+            {
                 throw new ResponseException('Unable to resolve public filename');
             }
 
@@ -156,19 +159,23 @@ 
      */
     private function getStream($file): StreamInterface
     {
-        if ($file instanceof StreamableInterface) {
+        if ($file instanceof StreamableInterface)
+        {
             return $file->getStream();
         }
 
-        if ($file instanceof StreamInterface) {
+        if ($file instanceof StreamInterface)
+        {
             return $file;
         }
 
-        if (is_resource($file)) {
+        if (is_resource($file))
+        {
             return $this->streamFactory->createStreamFromResource($file);
         }
 
-        if (!$this->files->isFile($file)) {
+        if (!$this->files->isFile($file))
+        {
             throw new ResponseException('Unable to allocate response body stream, file does not exist');
         }