From fb3226e113a1f7c1cf8330faf9d3f441cf78e689 Mon Sep 17 00:00:00 2001
From: Daniel Opitz <git@copynpaste.de>
Date: Fri, 21 Dec 2018 18:41:20 +0100
Subject: [PATCH] slim/http is now slim/psr7

---
 composer.json                    |  2 +-
 src/BaseTest.php                 |  2 +-
 tests/Slim/RequestTest.php       | 17 ++++++++++++-----
 tests/Slim/ResponseTest.php      |  2 +-
 tests/Slim/ServerRequestTest.php | 17 ++++++++++++-----
 tests/Slim/StreamTest.php        |  2 +-
 tests/Slim/UploadedFileTest.php  |  2 +-
 tests/Slim/UriTest.php           |  4 ++--
 8 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index 3e32dbd..aa3ec93 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "guzzlehttp/psr7": "^1.4",
         "nyholm/psr7": "dev-master",
         "ringcentral/psr7": "^1.2",
-        "slim/http": "^0.3",
+        "slim/psr7": "dev-master",
         "zendframework/zend-diactoros": "^1.8"
     },
     "extra": {
diff --git a/src/BaseTest.php b/src/BaseTest.php
index 11ca586..2afcea5 100644
--- a/src/BaseTest.php
+++ b/src/BaseTest.php
@@ -7,7 +7,7 @@
 use GuzzleHttp\Psr7\Uri as GuzzleUri;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\UriInterface;
-use Slim\Http\Uri as SlimUri;
+use Slim\Psr7\Uri as SlimUri;
 use Zend\Diactoros\Stream as ZendStream;
 use Zend\Diactoros\Uri as ZendUri;
 use Zend\Diactoros\UploadedFile as ZendUploadedFile;
diff --git a/tests/Slim/RequestTest.php b/tests/Slim/RequestTest.php
index 864ff49..d189977 100644
--- a/tests/Slim/RequestTest.php
+++ b/tests/Slim/RequestTest.php
@@ -3,15 +3,22 @@
 namespace Http\Psr7Test\Tests\Slim;
 
 use Http\Psr7Test\RequestIntegrationTest;
-use Slim\Http\Body;
-use Slim\Http\Headers;
-use Slim\Http\Request;
-use Slim\Http\Uri;
+use Slim\Psr7\Factory\StreamFactory;
+use Slim\Psr7\Factory\UriFactory;
+use Slim\Psr7\Headers;
+use Slim\Psr7\Request;
 
 class RequestTest extends RequestIntegrationTest
 {
     public function createSubject()
     {
-        return new Request('GET', new Uri('http', 'foo.com'), new Headers([]), [], [], new Body(fopen('php://temp', 'r+')));
+        return new Request(
+            'GET',
+            (new UriFactory())->createUri('/'),
+            new Headers([]),
+            [],
+            [],
+            (new StreamFactory())->createStream()
+        );
     }
 }
diff --git a/tests/Slim/ResponseTest.php b/tests/Slim/ResponseTest.php
index 0cb94cb..0f1f005 100644
--- a/tests/Slim/ResponseTest.php
+++ b/tests/Slim/ResponseTest.php
@@ -3,7 +3,7 @@
 namespace Http\Psr7Test\Tests\Slim;
 
 use Http\Psr7Test\ResponseIntegrationTest;
-use Slim\Http\Response;
+use Slim\Psr7\Response;
 
 class ResponseTest extends ResponseIntegrationTest
 {
diff --git a/tests/Slim/ServerRequestTest.php b/tests/Slim/ServerRequestTest.php
index 28b3af3..d46a521 100644
--- a/tests/Slim/ServerRequestTest.php
+++ b/tests/Slim/ServerRequestTest.php
@@ -2,16 +2,23 @@
 
 namespace Http\Psr7Test\Tests\Slim;
 
-use Slim\Http\Body;
-use Slim\Http\Headers;
-use Slim\Http\Request;
-use Slim\Http\Uri;
+use Slim\Psr7\Factory\StreamFactory;
+use Slim\Psr7\Factory\UriFactory;
+use Slim\Psr7\Headers;
+use Slim\Psr7\Request;
 use Http\Psr7Test\ServerRequestIntegrationTest;
 
 class ServerRequestTest extends ServerRequestIntegrationTest
 {
     public function createSubject()
     {
-        return new Request('GET', new Uri('http', 'foo.com'), new Headers([]), $_COOKIE, $_SERVER, new Body(fopen('php://temp', 'r+')));
+        return new Request(
+            'GET',
+            (new UriFactory())->createUri('/'),
+            new Headers([]),
+            $_COOKIE,
+            $_SERVER,
+            (new StreamFactory())->createStream()
+        );
     }
 }
diff --git a/tests/Slim/StreamTest.php b/tests/Slim/StreamTest.php
index 7e134a5..efd777f 100644
--- a/tests/Slim/StreamTest.php
+++ b/tests/Slim/StreamTest.php
@@ -4,7 +4,7 @@
 
 use Http\Psr7Test\StreamIntegrationTest;
 use Psr\Http\Message\StreamInterface;
-use Slim\Http\Stream;
+use Slim\Psr7\Stream;
 
 class StreamTest extends StreamIntegrationTest
 {
diff --git a/tests/Slim/UploadedFileTest.php b/tests/Slim/UploadedFileTest.php
index 0dc25cd..63b0767 100644
--- a/tests/Slim/UploadedFileTest.php
+++ b/tests/Slim/UploadedFileTest.php
@@ -3,7 +3,7 @@
 namespace Http\Psr7Test\Tests\Slim;
 
 use Http\Psr7Test\UploadedFileIntegrationTest;
-use Slim\Http\UploadedFile;
+use Slim\Psr7\UploadedFile;
 
 class UploadedFileTest extends UploadedFileIntegrationTest
 {
diff --git a/tests/Slim/UriTest.php b/tests/Slim/UriTest.php
index b84eb59..b9362bd 100644
--- a/tests/Slim/UriTest.php
+++ b/tests/Slim/UriTest.php
@@ -3,12 +3,12 @@
 namespace Http\Psr7Test\Tests\Slim;
 
 use Http\Psr7Test\UriIntegrationTest;
-use Slim\Http\Uri;
+use Slim\Psr7\Factory\UriFactory;
 
 class UriTest extends UriIntegrationTest
 {
     public function createUri($uri)
     {
-        return Uri::createFromString($uri);
+        return (new UriFactory())->createUri($uri);
     }
 }