spiral / framework

src/Validation/src/Checker/DatetimeChecker/ThresholdChecker.php

Spacing +7 added lines, -7 removed lines

@@ -20,7 +20,7 @@ 
         bool $useMicroSeconds = false
     ): bool {
         $compare = $this->compare($this->date($value), $this->date($threshold), $useMicroSeconds);
-        if (is_bool($compare)) {
+        if (is_bool($compare)){
             return $compare;
         }
 
@@ -37,7 +37,7 @@ 
         bool $useMicroSeconds = false
     ): bool {
         $compare = $this->compare($this->date($value), $this->date($threshold), $useMicroSeconds);
-        if (is_bool($compare)) {
+        if (is_bool($compare)){
             return $compare;
         }
 
@@ -49,11 +49,11 @@ 
      */
     private function date($value): ?DateTimeImmutable
     {
-        if ($value instanceof DateTimeImmutable) {
+        if ($value instanceof DateTimeImmutable){
             return $value;
         }
 
-        if ($value instanceof DateTime) {
+        if ($value instanceof DateTime){
             return DateTimeImmutable::createFromMutable($value);
         }
 
@@ -65,15 +65,15 @@ 
      */
     private function compare(?DateTimeImmutable $date, ?DateTimeImmutable $threshold, bool $useMicroseconds)
     {
-        if ($date === null) {
+        if ($date === null){
             return false;
         }
 
-        if ($threshold === null) {
+        if ($threshold === null){
             return true;
         }
 
-        if (!$useMicroseconds) {
+        if (!$useMicroseconds){
             $date = $this->dropMicroSeconds($date);
             $threshold = $this->dropMicroSeconds($threshold);
         }

Braces +14 added lines, -7 removed lines

@@ -20,7 +20,8 @@ 
         bool $useMicroSeconds = false
     ): bool {
         $compare = $this->compare($this->date($value), $this->date($threshold), $useMicroSeconds);
-        if (is_bool($compare)) {
+        if (is_bool($compare))
+        {
             return $compare;
         }
 
@@ -37,7 +38,8 @@ 
         bool $useMicroSeconds = false
     ): bool {
         $compare = $this->compare($this->date($value), $this->date($threshold), $useMicroSeconds);
-        if (is_bool($compare)) {
+        if (is_bool($compare))
+        {
             return $compare;
         }
 
@@ -49,11 +51,13 @@ 
      */
     private function date($value): ?DateTimeImmutable
     {
-        if ($value instanceof DateTimeImmutable) {
+        if ($value instanceof DateTimeImmutable)
+        {
             return $value;
         }
 
-        if ($value instanceof DateTime) {
+        if ($value instanceof DateTime)
+        {
             return DateTimeImmutable::createFromMutable($value);
         }
 
@@ -65,15 +69,18 @@ 
      */
     private function compare(?DateTimeImmutable $date, ?DateTimeImmutable $threshold, bool $useMicroseconds)
     {
-        if ($date === null) {
+        if ($date === null)
+        {
             return false;
         }
 
-        if ($threshold === null) {
+        if ($threshold === null)
+        {
             return true;
         }
 
-        if (!$useMicroseconds) {
+        if (!$useMicroseconds)
+        {
             $date = $this->dropMicroSeconds($date);
             $threshold = $this->dropMicroSeconds($threshold);
         }

src/Validation/src/AbstractRule.php

Spacing +2 added lines, -2 removed lines

@@ -43,11 +43,11 @@
      */
     public function getConditions(): Generator
     {
-        if (empty($this->conditions)) {
+        if (empty($this->conditions)){
             return;
         }
 
-        foreach ($this->conditions as $condition) {
+        foreach ($this->conditions as $condition){
             yield $condition->withOptions($this->conditions->offsetGet($condition));
         }
     }

Braces +4 added lines, -2 removed lines

@@ -43,11 +43,13 @@
      */
     public function getConditions(): Generator
     {
-        if (empty($this->conditions)) {
+        if (empty($this->conditions))
+        {
             return;
         }
 
-        foreach ($this->conditions as $condition) {
+        foreach ($this->conditions as $condition)
+        {
             yield $condition->withOptions($this->conditions->offsetGet($condition));
         }
     }

src/Validation/src/Config/ValidatorConfig.php

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
     public function __construct(array $config = [])
     {
         parent::__construct($config);
-        if (!empty($this->config['aliases'])) {
+        if (!empty($this->config['aliases'])){
             $this->config['aliases'] = $this->normalizeAliases($this->config['aliases']);
         }
     }
@@ -50,12 +50,12 @@ 
      */
     public function getChecker(string $name): Autowire
     {
-        if (!$this->hasChecker($name)) {
+        if (!$this->hasChecker($name)){
             throw new ValidationException("Undefined checker `{$name}``.");
         }
 
         $instance = $this->wire('checkers', $name);
-        if ($instance !== null) {
+        if ($instance !== null){
             return $instance;
         }
 
@@ -69,12 +69,12 @@ 
 
     public function getCondition(string $name): Autowire
     {
-        if (!$this->hasCondition($name)) {
+        if (!$this->hasCondition($name)){
             throw new ValidationException("Undefined condition `{$name}`.");
         }
 
         $instance = $this->wire('conditions', $name);
-        if ($instance !== null) {
+        if ($instance !== null){
             return $instance;
         }
 
@@ -90,9 +90,9 @@ 
      */
     public function mapFunction($function)
     {
-        if (is_string($function)) {
+        if (is_string($function)){
             $function = $this->resolveAlias($function);
-            if (strpos($function, ':') !== false) {
+            if (strpos($function, ':') !== false){
                 $function = explode(':', $function);
             }
         }
@@ -102,11 +102,11 @@ 
 
     private function wire(string $section, string $name): ?Autowire
     {
-        if (is_string($this->config[$section][$name])) {
+        if (is_string($this->config[$section][$name])){
             return new Autowire($this->config[$section][$name]);
         }
 
-        if (isset($this->config[$section][$name]['class'])) {
+        if (isset($this->config[$section][$name]['class'])){
             return new Autowire(
                 $this->config[$section][$name]['class'],
                 $this->config[$section][$name]['options'] ?? []

Braces +18 added lines, -9 removed lines

@@ -34,7 +34,8 @@ 
     public function __construct(array $config = [])
     {
         parent::__construct($config);
-        if (!empty($this->config['aliases'])) {
+        if (!empty($this->config['aliases']))
+        {
             $this->config['aliases'] = $this->normalizeAliases($this->config['aliases']);
         }
     }
@@ -50,12 +51,14 @@ 
      */
     public function getChecker(string $name): Autowire
     {
-        if (!$this->hasChecker($name)) {
+        if (!$this->hasChecker($name))
+        {
             throw new ValidationException("Undefined checker `{$name}``.");
         }
 
         $instance = $this->wire('checkers', $name);
-        if ($instance !== null) {
+        if ($instance !== null)
+        {
             return $instance;
         }
 
@@ -69,12 +72,14 @@ 
 
     public function getCondition(string $name): Autowire
     {
-        if (!$this->hasCondition($name)) {
+        if (!$this->hasCondition($name))
+        {
             throw new ValidationException("Undefined condition `{$name}`.");
         }
 
         $instance = $this->wire('conditions', $name);
-        if ($instance !== null) {
+        if ($instance !== null)
+        {
             return $instance;
         }
 
@@ -90,9 +95,11 @@ 
      */
     public function mapFunction($function)
     {
-        if (is_string($function)) {
+        if (is_string($function))
+        {
             $function = $this->resolveAlias($function);
-            if (strpos($function, ':') !== false) {
+            if (strpos($function, ':') !== false)
+            {
                 $function = explode(':', $function);
             }
         }
@@ -102,11 +109,13 @@ 
 
     private function wire(string $section, string $name): ?Autowire
     {
-        if (is_string($this->config[$section][$name])) {
+        if (is_string($this->config[$section][$name]))
+        {
             return new Autowire($this->config[$section][$name]);
         }
 
-        if (isset($this->config[$section][$name]['class'])) {
+        if (isset($this->config[$section][$name]['class']))
+        {
             return new Autowire(
                 $this->config[$section][$name]['class'],
                 $this->config[$section][$name]['options'] ?? []

src/DataGrid/src/Specification/Value/RangeValue.php

Spacing +5 added lines, -5 removed lines

@@ -58,11 +58,11 @@ 
 
     private function validateBoundaries(Boundary $from, Boundary $to): void
     {
-        if (!$this->acceptsBoundary($from) || !$this->acceptsBoundary($to)) {
+        if (!$this->acceptsBoundary($from) || !$this->acceptsBoundary($to)){
             throw new ValueException('Range boundaries should be applicable via passed type.');
         }
 
-        if ($this->convertBoundaryValue($from) === $this->convertBoundaryValue($to)) {
+        if ($this->convertBoundaryValue($from) === $this->convertBoundaryValue($to)){
             throw new ValueException('Range boundaries should be different.');
         }
     }
@@ -85,7 +85,7 @@ 
      */
     private function acceptsFrom($value): bool
     {
-        if ($this->from->empty) {
+        if ($this->from->empty){
             return true;
         }
 
@@ -99,7 +99,7 @@ 
      */
     private function acceptsTo($value): bool
     {
-        if ($this->to->empty) {
+        if ($this->to->empty){
             return true;
         }
 
@@ -111,7 +111,7 @@ 
     private function setBoundaries(Boundary $from, Boundary $to): void
     {
         //Swap if from < to and both not empty
-        if (!$from->empty && !$to->empty && $from->value > $to->value) {
+        if (!$from->empty && !$to->empty && $from->value > $to->value){
             [$from, $to] = [$to, $from];
         }
 

Braces +10 added lines, -5 removed lines

@@ -58,11 +58,13 @@ 
 
     private function validateBoundaries(Boundary $from, Boundary $to): void
     {
-        if (!$this->acceptsBoundary($from) || !$this->acceptsBoundary($to)) {
+        if (!$this->acceptsBoundary($from) || !$this->acceptsBoundary($to))
+        {
             throw new ValueException('Range boundaries should be applicable via passed type.');
         }
 
-        if ($this->convertBoundaryValue($from) === $this->convertBoundaryValue($to)) {
+        if ($this->convertBoundaryValue($from) === $this->convertBoundaryValue($to))
+        {
             throw new ValueException('Range boundaries should be different.');
         }
     }
@@ -85,7 +87,8 @@ 
      */
     private function acceptsFrom($value): bool
     {
-        if ($this->from->empty) {
+        if ($this->from->empty)
+        {
             return true;
         }
 
@@ -99,7 +102,8 @@ 
      */
     private function acceptsTo($value): bool
     {
-        if ($this->to->empty) {
+        if ($this->to->empty)
+        {
             return true;
         }
 
@@ -111,7 +115,8 @@ 
     private function setBoundaries(Boundary $from, Boundary $to): void
     {
         //Swap if from < to and both not empty
-        if (!$from->empty && !$to->empty && $from->value > $to->value) {
+        if (!$from->empty && !$to->empty && $from->value > $to->value)
+        {
             [$from, $to] = [$to, $from];
         }
 

src/Http/src/Header/AcceptHeader.php

Spacing +16 added lines, -16 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $item) {
+        foreach ($items as $item){
             $this->addItem($item);
         }
     }
@@ -50,9 +50,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);
             }
         }
@@ -86,7 +86,7 @@ 
      */
     public function getAll(): array
     {
-        if (!$this->sorted) {
+        if (!$this->sorted){
             /**
              * Sort item in descending order.
              */
@@ -105,12 +105,12 @@ 
      */
     private function addItem($item): void
     {
-        if (is_scalar($item)) {
+        if (is_scalar($item)){
             $item = AcceptHeaderItem::fromString((string)$item);
         }
 
         /** @var AcceptHeaderItem|array $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,
@@ -119,7 +119,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;
         }
@@ -134,9 +134,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());
@@ -155,11 +155,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);
             }
 
@@ -171,23 +171,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 +32 added lines, -16 removed lines

@@ -35,7 +35,8 @@ 
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $item) {
+        foreach ($items as $item)
+        {
             $this->addItem($item);
         }
     }
@@ -50,9 +51,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);
             }
         }
@@ -86,7 +89,8 @@ 
      */
     public function getAll(): array
     {
-        if (!$this->sorted) {
+        if (!$this->sorted)
+        {
             /**
              * Sort item in descending order.
              */
@@ -105,12 +109,14 @@ 
      */
     private function addItem($item): void
     {
-        if (is_scalar($item)) {
+        if (is_scalar($item))
+        {
             $item = AcceptHeaderItem::fromString((string)$item);
         }
 
         /** @var AcceptHeaderItem|array $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,
@@ -119,7 +125,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;
         }
@@ -134,9 +141,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());
@@ -155,11 +164,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);
             }
 
@@ -171,23 +182,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/Pipeline.php

Braces +4 added lines, -2 removed lines

@@ -65,12 +65,14 @@
      */
     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);
         }
 

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/CallableHandler.php

Spacing +10 added lines, -10 removed lines

@@ -49,21 +49,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
         );
     }
 
@@ -76,17 +76,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

@@ -49,13 +49,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;
             }
         }
@@ -76,17 +82,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/SapiRequestFactory.php

Spacing +25 added lines, -25 removed lines

@@ -69,7 +69,7 @@ 
         UriFactoryInterface $uriFactory,
         StreamFactoryInterface $streamFactory,
         UploadedFileFactoryInterface $uploadedFileFactory
-    ) {
+    ){
         $this->requestFactory = $requestFactory;
         $this->uriFactory = $uriFactory;
         $this->streamFactory = $streamFactory;
@@ -106,12 +106,12 @@ 
         $uri = $this->getUri($server);
 
         $request = $this->requestFactory->createServerRequest($method, $uri, $server);
-        foreach ($headers as $name => $value) {
+        foreach ($headers as $name => $value){
             $request = $request->withAddedHeader($name, $value);
         }
 
         $protocol = '1.1';
-        if (!empty($_SERVER['SERVER_PROTOCOL'])) {
+        if (!empty($_SERVER['SERVER_PROTOCOL'])){
             $protocol = str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']);
         }
 
@@ -122,15 +122,15 @@ 
             ->withCookieParams($cookies)
             ->withUploadedFiles($this->getUploadedFilesArray($files));
 
-        if ($body === null) {
+        if ($body === null){
             return $request;
         }
 
-        if (\is_resource($body)) {
+        if (\is_resource($body)){
             $body = $this->streamFactory->createStreamFromResource($body);
-        } elseif (\is_string($body)) {
+        } elseif (\is_string($body)){
             $body = $this->streamFactory->createStream($body);
-        } elseif (!$body instanceof StreamInterface) {
+        } elseif (!$body instanceof StreamInterface){
             throw new InvalidArgumentException(
                 'Body parameter for ServerRequestFactory::createFromParameters() '
                 . 'must be instance of StreamInterface, resource or null.'
@@ -143,29 +143,29 @@ 
     private function getUri(array $server): UriInterface
     {
         $uri = $this->uriFactory->createUri();
-        if (isset($server['HTTPS'])) {
+        if (isset($server['HTTPS'])){
             $uri = $uri->withScheme($server['HTTPS'] === 'on' ? 'https' : 'http');
         }
 
-        if (isset($server['HTTP_HOST'])) {
-            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) {
+        if (isset($server['HTTP_HOST'])){
+            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)){
                 $uri = $uri->withHost($matches[1])->withPort($matches[2]);
-            } else {
+            }else{
                 $uri = $uri->withHost($server['HTTP_HOST']);
             }
-        } elseif (isset($server['SERVER_NAME'])) {
+        } elseif (isset($server['SERVER_NAME'])){
             $uri = $uri->withHost($server['SERVER_NAME']);
         }
 
-        if (isset($server['SERVER_PORT'])) {
+        if (isset($server['SERVER_PORT'])){
             $uri = $uri->withPort($server['SERVER_PORT']);
         }
 
-        if (isset($server['REQUEST_URI'])) {
+        if (isset($server['REQUEST_URI'])){
             $uri = $uri->withPath(\explode('?', $server['REQUEST_URI'])[0]);
         }
 
-        if (isset($server['QUERY_STRING'])) {
+        if (isset($server['QUERY_STRING'])){
             $uri = $uri->withQuery($server['QUERY_STRING']);
         }
 
@@ -174,12 +174,12 @@ 
 
     private static function getHeadersFromGlobals(): array
     {
-        if (\function_exists('getallheaders')) {
+        if (\function_exists('getallheaders')){
             $headers = getallheaders();
-        } else {
+        }else{
             $headers = [];
-            foreach ($_SERVER as $name => $value) {
-                if (strncmp($name, 'HTTP_', 5) === 0) {
+            foreach ($_SERVER as $name => $value){
+                if (strncmp($name, 'HTTP_', 5) === 0){
                     $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
                     $headers[$name] = $value;
                 }
@@ -192,7 +192,7 @@ 
     private function getUploadedFilesArray(array $filesArray): array
     {
         $files = [];
-        foreach ($filesArray as $class => $info) {
+        foreach ($filesArray as $class => $info){
             $files[$class] = [];
             $this->populateUploadedFileRecursive(
                 $files[$class],
@@ -220,8 +220,8 @@ 
      */
     private function populateUploadedFileRecursive(&$files, $names, $tempNames, $types, $sizes, $errors): void
     {
-        if (\is_array($names)) {
-            foreach ($names as $i => $name) {
+        if (\is_array($names)){
+            foreach ($names as $i => $name){
                 $files[$i] = [];
                 $this->populateUploadedFileRecursive(
                     $files[$i],
@@ -232,10 +232,10 @@ 
                     $errors[$i]
                 );
             }
-        } else {
-            try {
+        }else{
+            try{
                 $stream = $this->streamFactory->createStreamFromFile($tempNames);
-            } catch (RuntimeException $e) {
+            }catch (RuntimeException $e){
                 $stream = $this->streamFactory->createStream();
             }
 

Braces +55 added lines, -24 removed lines

@@ -106,12 +106,14 @@ 
         $uri = $this->getUri($server);
 
         $request = $this->requestFactory->createServerRequest($method, $uri, $server);
-        foreach ($headers as $name => $value) {
+        foreach ($headers as $name => $value)
+        {
             $request = $request->withAddedHeader($name, $value);
         }
 
         $protocol = '1.1';
-        if (!empty($_SERVER['SERVER_PROTOCOL'])) {
+        if (!empty($_SERVER['SERVER_PROTOCOL']))
+        {
             $protocol = str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']);
         }
 
@@ -122,15 +124,21 @@ 
             ->withCookieParams($cookies)
             ->withUploadedFiles($this->getUploadedFilesArray($files));
 
-        if ($body === null) {
+        if ($body === null)
+        {
             return $request;
         }
 
-        if (\is_resource($body)) {
+        if (\is_resource($body))
+        {
             $body = $this->streamFactory->createStreamFromResource($body);
-        } elseif (\is_string($body)) {
+        }
+        elseif (\is_string($body))
+        {
             $body = $this->streamFactory->createStream($body);
-        } elseif (!$body instanceof StreamInterface) {
+        }
+        elseif (!$body instanceof StreamInterface)
+        {
             throw new InvalidArgumentException(
                 'Body parameter for ServerRequestFactory::createFromParameters() '
                 . 'must be instance of StreamInterface, resource or null.'
@@ -143,29 +151,39 @@ 
     private function getUri(array $server): UriInterface
     {
         $uri = $this->uriFactory->createUri();
-        if (isset($server['HTTPS'])) {
+        if (isset($server['HTTPS']))
+        {
             $uri = $uri->withScheme($server['HTTPS'] === 'on' ? 'https' : 'http');
         }
 
-        if (isset($server['HTTP_HOST'])) {
-            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) {
+        if (isset($server['HTTP_HOST']))
+        {
+            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches))
+            {
                 $uri = $uri->withHost($matches[1])->withPort($matches[2]);
-            } else {
+            }
+            else
+            {
                 $uri = $uri->withHost($server['HTTP_HOST']);
             }
-        } elseif (isset($server['SERVER_NAME'])) {
+        }
+        elseif (isset($server['SERVER_NAME']))
+        {
             $uri = $uri->withHost($server['SERVER_NAME']);
         }
 
-        if (isset($server['SERVER_PORT'])) {
+        if (isset($server['SERVER_PORT']))
+        {
             $uri = $uri->withPort($server['SERVER_PORT']);
         }
 
-        if (isset($server['REQUEST_URI'])) {
+        if (isset($server['REQUEST_URI']))
+        {
             $uri = $uri->withPath(\explode('?', $server['REQUEST_URI'])[0]);
         }
 
-        if (isset($server['QUERY_STRING'])) {
+        if (isset($server['QUERY_STRING']))
+        {
             $uri = $uri->withQuery($server['QUERY_STRING']);
         }
 
@@ -174,12 +192,17 @@ 
 
     private static function getHeadersFromGlobals(): array
     {
-        if (\function_exists('getallheaders')) {
+        if (\function_exists('getallheaders'))
+        {
             $headers = getallheaders();
-        } else {
+        }
+        else
+        {
             $headers = [];
-            foreach ($_SERVER as $name => $value) {
-                if (strncmp($name, 'HTTP_', 5) === 0) {
+            foreach ($_SERVER as $name => $value)
+            {
+                if (strncmp($name, 'HTTP_', 5) === 0)
+                {
                     $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
                     $headers[$name] = $value;
                 }
@@ -192,7 +215,8 @@ 
     private function getUploadedFilesArray(array $filesArray): array
     {
         $files = [];
-        foreach ($filesArray as $class => $info) {
+        foreach ($filesArray as $class => $info)
+        {
             $files[$class] = [];
             $this->populateUploadedFileRecursive(
                 $files[$class],
@@ -220,8 +244,10 @@ 
      */
     private function populateUploadedFileRecursive(&$files, $names, $tempNames, $types, $sizes, $errors): void
     {
-        if (\is_array($names)) {
-            foreach ($names as $i => $name) {
+        if (\is_array($names))
+        {
+            foreach ($names as $i => $name)
+            {
                 $files[$i] = [];
                 $this->populateUploadedFileRecursive(
                     $files[$i],
@@ -232,10 +258,15 @@ 
                     $errors[$i]
                 );
             }
-        } else {
-            try {
+        }
+        else
+        {
+            try
+            {
                 $stream = $this->streamFactory->createStreamFromFile($tempNames);
-            } catch (RuntimeException $e) {
+            }
+            catch (RuntimeException $e)
+            {
                 $stream = $this->streamFactory->createStream();
             }