Merge pull request #15 from joelwurtz/feature/interface-change

Fix interface update in message factory

Author: sagikazarmark

spec/MessageFactory/DiactorosFactorySpec.php

@@ -32,26 +32,26 @@ function it_creates_a_request()
 
     function it_creates_a_request_with_string_body()
     {
-        $this->createRequest('POST', '/', '1.1', [], 'body')->shouldHaveType('Psr\Http\Message\RequestInterface');
+        $this->createRequest('POST', '/', [], 'body', '1.1')->shouldHaveType('Psr\Http\Message\RequestInterface');
     }
 
     function it_creates_a_request_with_empty_body()
     {
-        $this->createRequest('POST', '/', '1.1', [], null)->shouldHaveType('Psr\Http\Message\RequestInterface');
+        $this->createRequest('POST', '/', [], null, '1.1')->shouldHaveType('Psr\Http\Message\RequestInterface');
     }
 
     function it_creates_a_request_with_stream_body(StreamInterface $stream)
     {
         $stream->rewind()->shouldBeCalled();
 
-        $this->createRequest('POST', '/', '1.1', [], $stream)->shouldHaveType('Psr\Http\Message\RequestInterface');
+        $this->createRequest('POST', '/', [], $stream, '1.1')->shouldHaveType('Psr\Http\Message\RequestInterface');
     }
 
     function it_creates_a_request_with_resource_body()
     {
         $resource = tmpfile();
 
-        $this->createRequest('POST', '/', '1.1', [], $resource)->shouldHaveType('Psr\Http\Message\RequestInterface');
+        $this->createRequest('POST', '/', [], $resource, '1.1')->shouldHaveType('Psr\Http\Message\RequestInterface');
     }
 
     function it_creates_a_response()

src/MessageFactory/DiactorosFactory.php

@@ -28,9 +28,9 @@ class DiactorosFactory implements MessageFactory
     public function createRequest(
         $method,
         $uri,
-        $protocolVersion = '1.1',
         array $headers = [],
-        $body = null
+        $body = null,
+        $protocolVersion = '1.1'
     ) {
         return (new Request(
             $uri,
@@ -46,9 +46,9 @@ public function createRequest(
     public function createResponse(
         $statusCode = 200,
         $reasonPhrase = null,
-        $protocolVersion = '1.1',
         array $headers = [],
-        $body = null
+        $body = null,
+        $protocolVersion = '1.1'
     ) {
         return (new Response(
             $this->createStream($body),

src/MessageFactory/GuzzleFactory.php

@@ -26,9 +26,9 @@ class GuzzleFactory implements MessageFactory
     public function createRequest(
         $method,
         $uri,
-        $protocolVersion = '1.1',
         array $headers = [],
-        $body = null
+        $body = null,
+        $protocolVersion = '1.1'
     ) {
         return new Request(
             $method,
@@ -45,9 +45,9 @@ public function createRequest(
     public function createResponse(
         $statusCode = 200,
         $reasonPhrase = null,
-        $protocolVersion = '1.1',
         array $headers = [],
-        $body = null
+        $body = null,
+        $protocolVersion = '1.1'
     ) {
         return new Response(
             $statusCode,