spiral / framework

src/Http/SapiRequestFactory.php

Spacing +25 added lines, -25 removed lines

@@ -69,7 +69,7 @@ 
         StreamFactoryInterface $streamFactory,
         UploadedFileFactoryInterface $uploadedFileFactory
 
-    ) {
+    ){
         $this->requestFactory = $requestFactory;
         $this->uriFactory = $uriFactory;
         $this->streamFactory = $streamFactory;
@@ -116,12 +116,12 @@ 
         $uri = $this->getUri($server, $headers);
 
         $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']);
         }
 
@@ -132,15 +132,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.'
             );
@@ -157,29 +157,29 @@ 
     private function getUri(array $server, array $headers): 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']);
         }
 
@@ -191,12 +191,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;
                 }
@@ -213,7 +213,7 @@ 
     private function getUploadedFilesArray(array $filesArray): array
     {
         $files = [];
-        foreach ($filesArray as $class => $info) {
+        foreach ($filesArray as $class => $info){
             $files[$class] = [];
             $this->populateUploadedFileRecursive(
                 $files[$class],
@@ -241,8 +241,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],
@@ -253,10 +253,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

@@ -116,12 +116,14 @@ 
         $uri = $this->getUri($server, $headers);
 
         $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']);
         }
 
@@ -132,15 +134,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.'
             );
@@ -157,29 +165,39 @@ 
     private function getUri(array $server, array $headers): 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']);
         }
 
@@ -191,12 +209,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;
                 }
@@ -213,7 +236,8 @@ 
     private function getUploadedFilesArray(array $filesArray): array
     {
         $files = [];
-        foreach ($filesArray as $class => $info) {
+        foreach ($filesArray as $class => $info)
+        {
             $files[$class] = [];
             $this->populateUploadedFileRecursive(
                 $files[$class],
@@ -241,8 +265,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],
@@ -253,10 +279,15 @@ 
                     $errors[$i]
                 );
             }
-        } else {
-            try {
+        }
+        else
+        {
+            try
+            {
                 $stream = $this->streamFactory->createStreamFromFile($tempNames);
-            } catch (\RuntimeException $e) {
+            }
+            catch (\RuntimeException $e)
+            {
                 $stream = $this->streamFactory->createStream();
             }