From 49c8e70a353874ff0629cbaa3aa1b37a8d8db586 Mon Sep 17 00:00:00 2001
From: Joel Wurtz <jwurtz@jolicode.com>
Date: Sat, 31 Oct 2015 15:28:02 +0100
Subject: [PATCH 1/2] Fix interface update in message factory

---
 src/MessageFactory/DiactorosFactory.php | 8 ++++----
 src/MessageFactory/GuzzleFactory.php    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/MessageFactory/DiactorosFactory.php b/src/MessageFactory/DiactorosFactory.php
index 65bb35c..27523e6 100644
--- a/src/MessageFactory/DiactorosFactory.php
+++ b/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),
diff --git a/src/MessageFactory/GuzzleFactory.php b/src/MessageFactory/GuzzleFactory.php
index 5ad1d57..fdb2caf 100644
--- a/src/MessageFactory/GuzzleFactory.php
+++ b/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,

From eb713939059035e8cb92fba9d6a8998ffc145b33 Mon Sep 17 00:00:00 2001
From: Joel Wurtz <jwurtz@jolicode.com>
Date: Sat, 31 Oct 2015 15:39:31 +0100
Subject: [PATCH 2/2] Fix spec for zend diactoros

---
 spec/MessageFactory/DiactorosFactorySpec.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/MessageFactory/DiactorosFactorySpec.php b/spec/MessageFactory/DiactorosFactorySpec.php
index 0783e0a..64c8bdf 100644
--- a/spec/MessageFactory/DiactorosFactorySpec.php
+++ b/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()