Change the order of arguments headers and body

Author: devanych

README.md

@@ -28,13 +28,13 @@ composer require httpsoft/http-request
 use HttpSoft\Request\Request;
 use HttpSoft\Request\RequestFactory;
 
-$request = new Request('POST', 'http://example.com', 'data://,Content', ['Content-Type' => 'text/html'], '2');
+$request = new Request('POST', 'http://example.com', ['Content-Type' => 'text/html'], 'data://,Content', '2');
 // Or using the factory:
 $request = RequestFactory::create(
     'POST', // Request method
     'https://example.com', // Request URI
-    'data://,Content', // HTTP message body
     ['Content-Type' => 'text/html' /* Other headers */],
+    'data://,Content', // HTTP message body
     '2' // HTTP protocol version
 );
 
@@ -59,8 +59,8 @@ $request = new ServerRequest(
     $_POST,
     'GET', // Request method
     'https://example.com', // Request URI
-    'php://input', // HTTP message body
     [/* Headers */],
+    'php://input', // HTTP message body
     '2' // HTTP protocol version
 );
 // Or using the factory (all necessary data will be received automatically):

src/Request.php

@@ -15,17 +15,17 @@ final class Request implements RequestInterface, RequestMethodInterface
     /**
      * @param string $method
      * @param UriInterface|string $uri
-     * @param StreamInterface|string|resource $body
      * @param array $headers
+     * @param StreamInterface|string|resource $body
      * @param string $protocol
      */
     public function __construct(
         string $method = self::METHOD_GET,
         $uri = '',
-        $body = 'php://temp',
         array $headers = [],
+        $body = 'php://temp',
         string $protocol = '1.1'
     ) {
-        $this->init($method, $uri, $body, $headers, $protocol);
+        $this->init($method, $uri, $headers, $body, $protocol);
     }
 }

src/RequestFactory.php

@@ -14,19 +14,19 @@ final class RequestFactory implements RequestFactoryInterface
     /**
      * @param string $method
      * @param UriInterface|string $uri
-     * @param StreamInterface|string|resource $body
      * @param array $headers
+     * @param StreamInterface|string|resource $body
      * @param string $protocol
      * @return RequestInterface
      */
     public static function create(
         string $method,
         $uri,
-        $body = 'php://temp',
         array $headers = [],
+        $body = 'php://temp',
         string $protocol = '1.1'
     ): RequestInterface {
-        return new Request($method, $uri, $body, $headers, $protocol);
+        return new Request($method, $uri, $headers, $body, $protocol);
     }
 
     /**

src/RequestTrait.php

@@ -218,15 +218,15 @@ public function withUri(UriInterface $uri, $preserveHost = false): RequestInterf
     /**
      * @param string $method
      * @param UriInterface|string $uri
-     * @param StreamInterface|string|resource $body
      * @param array $headers
+     * @param StreamInterface|string|resource $body
      * @param string $protocol
      */
     private function init(
         string $method = RequestMethodInterface::METHOD_GET,
         $uri = '',
-        $body = 'php://temp',
         array $headers = [],
+        $body = 'php://temp',
         string $protocol = '1.1'
     ): void {
         $this->setMethod($method);

src/ServerRequest.php

@@ -59,8 +59,8 @@ final class ServerRequest implements ServerRequestInterface, RequestMethodInterf
      * @param array|object|null $parsedBody
      * @param string $method
      * @param UriInterface|string $uri
-     * @param StreamInterface|string|resource $body
      * @param array $headers
+     * @param StreamInterface|string|resource $body
      * @param string $protocol
      */
     public function __construct(
@@ -71,8 +71,8 @@ public function __construct(
         $parsedBody = null,
         string $method = self::METHOD_GET,
         $uri = '',
-        $body = 'php://input',
         array $headers = [],
+        $body = 'php://input',
         string $protocol = '1.1'
     ) {
         $this->validateUploadedFiles($uploadedFiles);
@@ -81,7 +81,7 @@ public function __construct(
         $this->cookieParams = $cookieParams;
         $this->queryParams = $queryParams;
         $this->parsedBody = $parsedBody;
-        $this->init($method, $uri, $body, $headers, $protocol);
+        $this->init($method, $uri, $headers, $body, $protocol);
     }
 
     /**

src/ServerRequestFactory.php

@@ -48,8 +48,8 @@ public static function createFromGlobals(
             $post ?? $_POST,
             $normalizer->normalizeMethod($server),
             $normalizer->normalizeUri($server),
-            new StreamPhpInput(),
             $normalizer->normalizeHeaders($server),
+            new StreamPhpInput(),
             $normalizer->normalizeProtocolVersion($server)
         );
     }
@@ -59,6 +59,6 @@ public static function createFromGlobals(
      */
     public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface
     {
-        return new ServerRequest($serverParams, [], [], [], null, $method, $uri, 'php://temp');
+        return new ServerRequest($serverParams, [], [], [], null, $method, $uri, [], 'php://temp');
     }
 }

tests/RequestFactoryTest.php

@@ -28,8 +28,8 @@ public function testCreate(): void
         $request = RequestFactory::create(
             $method = 'POST',
             $uri = 'http://example.com',
-            'data://,Content',
             ['Content-Type' => 'text/html'],
+            'data://,Content',
             $protocol = '1.0'
         );
         $this->assertSame($method, $request->getMethod());