spiral / framework

src/Http/tests/ServerTest.php

Spacing +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
         $this->container->bind(ServerRequestInterface::class, $request);
 
         $this->assertSame(
-            ['PATH' => 'sample',],
+            ['PATH' => 'sample', ],
             $this->input->server->__debugInfo()
         );
     }
@@ -178,7 +178,7 @@ 
         $this->container->bind(ServerRequestInterface::class, $request);
 
         $this->assertSame(
-            ['PATH' => 'sample',],
+            ['PATH' => 'sample', ],
             iterator_to_array($this->input->server)
         );
     }

src/Http/src/CallableHandler.php

Indentation -1 removed lines

@@ -75,7 +75,6 @@
      * @param Response $response Initial pipeline response.
      * @param mixed    $result   Generated endpoint output.
      * @param string   $output   Buffer output.
-
      * @return Response
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response

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/Header/AcceptHeader.php

Spacing +17 added lines, -17 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $item) {
+        foreach ($items as $item){
             $this->addItem($item);
         }
     }
@@ -58,9 +58,9 @@ 
         $header = new static();
 
         $parts = explode(',', $raw);
-        foreach ($parts as $part) {
+        foreach ($parts as $part){
             $part = trim($part);
-            if ($part !== '') {
+            if ($part !== ''){
                 $header->addItem($part);
             }
         }
@@ -103,11 +103,11 @@ 
      */
     public function getAll(): array
     {
-        if (!$this->sorted) {
+        if (!$this->sorted){
             /**
              * Sort item in descending order.
              */
-            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b) {
+            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b){
                 return self::compare($a, $b) * -1;
             });
 
@@ -124,11 +124,11 @@ 
      */
     private function addItem($item): void
     {
-        if (is_scalar($item)) {
+        if (is_scalar($item)){
             $item = AcceptHeaderItem::fromString((string)$item);
         }
 
-        if (!$item instanceof AcceptHeaderItem) {
+        if (!$item instanceof AcceptHeaderItem){
             throw new AcceptHeaderException(sprintf(
                 'Accept Header item expected to be an instance of `%s` or a string, got `%s`',
                 AcceptHeaderItem::class,
@@ -137,7 +137,7 @@ 
         }
 
         $value = strtolower($item->getValue());
-        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1)) {
+        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1)){
             $this->sorted = false;
             $this->items[$value] = $item;
         }
@@ -153,9 +153,9 @@ 
      */
     private static function compare(AcceptHeaderItem $a, AcceptHeaderItem $b): int
     {
-        if ($a->getQuality() === $b->getQuality()) {
+        if ($a->getQuality() === $b->getQuality()){
             // If quality are same value with more params has more weight.
-            if (count($a->getParams()) === count($b->getParams())) {
+            if (count($a->getParams()) === count($b->getParams())){
                 // If quality and params then check for specific type or subtype.
                 // Means */* or * has less weight.
                 return static::compareValue($a->getValue(), $b->getValue());
@@ -178,11 +178,11 @@ 
     private static function compareValue(string $a, string $b): int
     {
         // Check "Accept" headers values with it is type and subtype.
-        if (strpos($a, '/') !== false && strpos($b, '/') !== false) {
+        if (strpos($a, '/') !== false && strpos($b, '/') !== false){
             [$typeA, $subtypeA] = explode('/', $a, 2);
             [$typeB, $subtypeB] = explode('/', $b, 2);
 
-            if ($typeA === $typeB) {
+            if ($typeA === $typeB){
                 return static::compareAtomic($subtypeA, $subtypeB);
             }
 
@@ -199,23 +199,23 @@ 
      */
     private static function compareAtomic(string $a, string $b): int
     {
-        if (mb_strpos($a, '*/') === 0) {
+        if (mb_strpos($a, '*/') === 0){
             $a = '*';
         }
 
-        if (mb_strpos($b, '*/') === 0) {
+        if (mb_strpos($b, '*/') === 0){
             $b = '*';
         }
 
-        if (strtolower($a) === strtolower($b)) {
+        if (strtolower($a) === strtolower($b)){
             return 0;
         }
 
-        if ($a === '*') {
+        if ($a === '*'){
             return -1;
         }
 
-        if ($b === '*') {
+        if ($b === '*'){
             return 1;
         }
 

Braces +34 added lines, -17 removed lines

@@ -36,7 +36,8 @@ 
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $item) {
+        foreach ($items as $item)
+        {
             $this->addItem($item);
         }
     }
@@ -58,9 +59,11 @@ 
         $header = new static();
 
         $parts = explode(',', $raw);
-        foreach ($parts as $part) {
+        foreach ($parts as $part)
+        {
             $part = trim($part);
-            if ($part !== '') {
+            if ($part !== '')
+            {
                 $header->addItem($part);
             }
         }
@@ -103,11 +106,13 @@ 
      */
     public function getAll(): array
     {
-        if (!$this->sorted) {
+        if (!$this->sorted)
+        {
             /**
              * Sort item in descending order.
              */
-            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b) {
+            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b)
+            {
                 return self::compare($a, $b) * -1;
             });
 
@@ -124,11 +129,13 @@ 
      */
     private function addItem($item): void
     {
-        if (is_scalar($item)) {
+        if (is_scalar($item))
+        {
             $item = AcceptHeaderItem::fromString((string)$item);
         }
 
-        if (!$item instanceof AcceptHeaderItem) {
+        if (!$item instanceof AcceptHeaderItem)
+        {
             throw new AcceptHeaderException(sprintf(
                 'Accept Header item expected to be an instance of `%s` or a string, got `%s`',
                 AcceptHeaderItem::class,
@@ -137,7 +144,8 @@ 
         }
 
         $value = strtolower($item->getValue());
-        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1)) {
+        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1))
+        {
             $this->sorted = false;
             $this->items[$value] = $item;
         }
@@ -153,9 +161,11 @@ 
      */
     private static function compare(AcceptHeaderItem $a, AcceptHeaderItem $b): int
     {
-        if ($a->getQuality() === $b->getQuality()) {
+        if ($a->getQuality() === $b->getQuality())
+        {
             // If quality are same value with more params has more weight.
-            if (count($a->getParams()) === count($b->getParams())) {
+            if (count($a->getParams()) === count($b->getParams()))
+            {
                 // If quality and params then check for specific type or subtype.
                 // Means */* or * has less weight.
                 return static::compareValue($a->getValue(), $b->getValue());
@@ -178,11 +188,13 @@ 
     private static function compareValue(string $a, string $b): int
     {
         // Check "Accept" headers values with it is type and subtype.
-        if (strpos($a, '/') !== false && strpos($b, '/') !== false) {
+        if (strpos($a, '/') !== false && strpos($b, '/') !== false)
+        {
             [$typeA, $subtypeA] = explode('/', $a, 2);
             [$typeB, $subtypeB] = explode('/', $b, 2);
 
-            if ($typeA === $typeB) {
+            if ($typeA === $typeB)
+            {
                 return static::compareAtomic($subtypeA, $subtypeB);
             }
 
@@ -199,23 +211,28 @@ 
      */
     private static function compareAtomic(string $a, string $b): int
     {
-        if (mb_strpos($a, '*/') === 0) {
+        if (mb_strpos($a, '*/') === 0)
+        {
             $a = '*';
         }
 
-        if (mb_strpos($b, '*/') === 0) {
+        if (mb_strpos($b, '*/') === 0)
+        {
             $b = '*';
         }
 
-        if (strtolower($a) === strtolower($b)) {
+        if (strtolower($a) === strtolower($b))
+        {
             return 0;
         }
 
-        if ($a === '*') {
+        if ($a === '*')
+        {
             return -1;
         }
 
-        if ($b === '*') {
+        if ($b === '*')
+        {
             return 1;
         }
 

src/Http/src/Header/AcceptHeaderItem.php

Spacing +10 added lines, -10 removed lines

@@ -45,17 +45,17 @@ 
      */
     public function __toString(): string
     {
-        if ($this->value === '') {
+        if ($this->value === ''){
             return '';
         }
 
         $parts = [$this->value];
 
-        if ($this->quality < 1) {
+        if ($this->quality < 1){
             $parts[] = "q=$this->quality";
         }
 
-        foreach ($this->getParams() as $name => $value) {
+        foreach ($this->getParams() as $name => $value){
             $parts[] = "$name=$value";
         }
 
@@ -76,20 +76,20 @@ 
         $quality = 1.0;
         $params = [];
 
-        foreach ($elements as $element) {
+        foreach ($elements as $element){
             $parsed = explode('=', trim($element), 2);
 
             // Wrong params must be ignored
-            if (count($parsed) !== 2) {
+            if (count($parsed) !== 2){
                 continue;
             }
 
             $name = trim($parsed[0]);
             $value = trim($parsed[1]);
 
-            if (strcasecmp($name, 'q') === 0) {
+            if (strcasecmp($name, 'q') === 0){
                 $quality = (float)$value;
-            } else {
+            }else{
                 $params[$name] = $value;
             }
         }
@@ -178,15 +178,15 @@ 
      */
     private function setParams(array $params): void
     {
-        foreach ($params as $name => $value) {
-            if (is_numeric($name) || !is_scalar($value)) {
+        foreach ($params as $name => $value){
+            if (is_numeric($name) || !is_scalar($value)){
                 continue;
             }
 
             $name = trim($name);
             $value = trim($value);
 
-            if ($name === '' || $value === '') {
+            if ($name === '' || $value === ''){
                 continue;
             }
 

Braces +21 added lines, -10 removed lines

@@ -45,17 +45,20 @@ 
      */
     public function __toString(): string
     {
-        if ($this->value === '') {
+        if ($this->value === '')
+        {
             return '';
         }
 
         $parts = [$this->value];
 
-        if ($this->quality < 1) {
+        if ($this->quality < 1)
+        {
             $parts[] = "q=$this->quality";
         }
 
-        foreach ($this->getParams() as $name => $value) {
+        foreach ($this->getParams() as $name => $value)
+        {
             $parts[] = "$name=$value";
         }
 
@@ -76,20 +79,25 @@ 
         $quality = 1.0;
         $params = [];
 
-        foreach ($elements as $element) {
+        foreach ($elements as $element)
+        {
             $parsed = explode('=', trim($element), 2);
 
             // Wrong params must be ignored
-            if (count($parsed) !== 2) {
+            if (count($parsed) !== 2)
+            {
                 continue;
             }
 
             $name = trim($parsed[0]);
             $value = trim($parsed[1]);
 
-            if (strcasecmp($name, 'q') === 0) {
+            if (strcasecmp($name, 'q') === 0)
+            {
                 $quality = (float)$value;
-            } else {
+            }
+            else
+            {
                 $params[$name] = $value;
             }
         }
@@ -178,15 +186,18 @@ 
      */
     private function setParams(array $params): void
     {
-        foreach ($params as $name => $value) {
-            if (is_numeric($name) || !is_scalar($value)) {
+        foreach ($params as $name => $value)
+        {
+            if (is_numeric($name) || !is_scalar($value))
+            {
                 continue;
             }
 
             $name = trim($name);
             $value = trim($value);
 
-            if ($name === '' || $value === '') {
+            if ($name === '' || $value === '')
+            {
                 continue;
             }
 

src/Http/src/Traits/JsonTrait.php

Spacing +2 added lines, -2 removed lines

@@ -29,11 +29,11 @@
      */
     private function writeJson(ResponseInterface $response, $payload, int $code = 200): ResponseInterface
     {
-        if ($payload instanceof JsonSerializable) {
+        if ($payload instanceof JsonSerializable){
             $payload = $payload->jsonSerialize();
         }
 
-        if (is_array($payload) && isset($payload['status'])) {
+        if (is_array($payload) && isset($payload['status'])){
             $code = $payload['status'];
         }
 

Braces +4 added lines, -2 removed lines

@@ -29,11 +29,13 @@
      */
     private function writeJson(ResponseInterface $response, $payload, int $code = 200): ResponseInterface
     {
-        if ($payload instanceof JsonSerializable) {
+        if ($payload instanceof JsonSerializable)
+        {
             $payload = $payload->jsonSerialize();
         }
 
-        if (is_array($payload) && isset($payload['status'])) {
+        if (is_array($payload) && isset($payload['status']))
+        {
             $code = $payload['status'];
         }
 

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}";
         }