From 34861658efb9899a6618cef03de46e2a52c80fc0 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Tue, 31 Jul 2018 12:32:56 -0700
Subject: [PATCH] Add support for psr/http-factory:1.0 (#10)

---
 composer.json                | 4 ++--
 src/RequestFactory.php       | 3 +--
 src/ResponseFactory.php      | 2 +-
 src/ServerRequestFactory.php | 3 +--
 src/StreamFactory.php        | 2 +-
 src/UploadedFileFactory.php  | 2 +-
 src/UriFactory.php           | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 24d09a5..9414837 100644
--- a/composer.json
+++ b/composer.json
@@ -18,11 +18,11 @@
         "psr/http-factory-implementation": "^1.0"
     },
     "require": {
-        "http-interop/http-factory": "^0.4",
+        "psr/http-factory": "^1.0",
         "guzzlehttp/psr7": "^1.4.2"
     },
     "require-dev": {
-        "http-interop/http-factory-tests": "^0.4",
+        "http-interop/http-factory-tests": "^0.5",
         "phpunit/phpunit": "^6.5"
     },
     "autoload": {
diff --git a/src/RequestFactory.php b/src/RequestFactory.php
index 5b49871..1ab71ee 100644
--- a/src/RequestFactory.php
+++ b/src/RequestFactory.php
@@ -3,9 +3,8 @@
 namespace Http\Factory\Guzzle;
 
 use GuzzleHttp\Psr7\Request;
-use Interop\Http\Factory\RequestFactoryInterface;
+use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\UriInterface;
 
 class RequestFactory implements RequestFactoryInterface
 {
diff --git a/src/ResponseFactory.php b/src/ResponseFactory.php
index f479a4e..1ae3d47 100644
--- a/src/ResponseFactory.php
+++ b/src/ResponseFactory.php
@@ -3,7 +3,7 @@
 namespace Http\Factory\Guzzle;
 
 use GuzzleHttp\Psr7\Response;
-use Interop\Http\Factory\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 
 class ResponseFactory implements ResponseFactoryInterface
diff --git a/src/ServerRequestFactory.php b/src/ServerRequestFactory.php
index 1d3ecc2..901014e 100644
--- a/src/ServerRequestFactory.php
+++ b/src/ServerRequestFactory.php
@@ -3,9 +3,8 @@
 namespace Http\Factory\Guzzle;
 
 use GuzzleHttp\Psr7\ServerRequest;
-use Interop\Http\Factory\ServerRequestFactoryInterface;
+use Psr\Http\Message\ServerRequestFactoryInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\UriInterface;
 
 class ServerRequestFactory implements ServerRequestFactoryInterface
 {
diff --git a/src/StreamFactory.php b/src/StreamFactory.php
index aa3a9a8..23aee9f 100644
--- a/src/StreamFactory.php
+++ b/src/StreamFactory.php
@@ -2,7 +2,7 @@
 
 namespace Http\Factory\Guzzle;
 
-use Interop\Http\Factory\StreamFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\StreamInterface;
 
 class StreamFactory implements StreamFactoryInterface
diff --git a/src/UploadedFileFactory.php b/src/UploadedFileFactory.php
index e2c8aa3..d58375b 100644
--- a/src/UploadedFileFactory.php
+++ b/src/UploadedFileFactory.php
@@ -3,7 +3,7 @@
 namespace Http\Factory\Guzzle;
 
 use GuzzleHttp\Psr7\UploadedFile;
-use Interop\Http\Factory\UploadedFileFactoryInterface;
+use Psr\Http\Message\UploadedFileFactoryInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
 
diff --git a/src/UriFactory.php b/src/UriFactory.php
index 58d28de..3250986 100644
--- a/src/UriFactory.php
+++ b/src/UriFactory.php
@@ -3,7 +3,7 @@
 namespace Http\Factory\Guzzle;
 
 use GuzzleHttp\Psr7\Uri;
-use Interop\Http\Factory\UriFactoryInterface;
+use Psr\Http\Message\UriFactoryInterface;
 use Psr\Http\Message\UriInterface;
 
 class UriFactory implements UriFactoryInterface