From 817592dff7bd3572dffd66f0025ef528bdce59b1 Mon Sep 17 00:00:00 2001
From: Florian Pisani <me@fpisani.dev>
Date: Fri, 28 May 2021 14:13:49 +0200
Subject: [PATCH 1/2] Added missing integration tests for Nyholm

---
 tests/Nyholm/RequestTest.php       | 14 ++++++++++++++
 tests/Nyholm/ResponseTest.php      | 14 ++++++++++++++
 tests/Nyholm/ServerRequestTest.php | 16 ++++++++++++++++
 tests/Nyholm/StreamTest.php        | 14 ++++++++++++++
 tests/Nyholm/UploadedFileTest.php  | 15 +++++++++++++++
 tests/Nyholm/UriTest.php           | 14 ++++++++++++++
 6 files changed, 87 insertions(+)
 create mode 100644 tests/Nyholm/RequestTest.php
 create mode 100644 tests/Nyholm/ResponseTest.php
 create mode 100644 tests/Nyholm/ServerRequestTest.php
 create mode 100644 tests/Nyholm/StreamTest.php
 create mode 100644 tests/Nyholm/UploadedFileTest.php
 create mode 100644 tests/Nyholm/UriTest.php

diff --git a/tests/Nyholm/RequestTest.php b/tests/Nyholm/RequestTest.php
new file mode 100644
index 0000000..1bc1936
--- /dev/null
+++ b/tests/Nyholm/RequestTest.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Http\Psr7Test\Tests\Nyholm;
+
+use Http\Psr7Test\RequestIntegrationTest;
+use Nyholm\Psr7\Request;
+
+class RequestTest extends RequestIntegrationTest
+{
+    public function createSubject()
+    {
+        return new Request('GET', '/');
+    }
+}
diff --git a/tests/Nyholm/ResponseTest.php b/tests/Nyholm/ResponseTest.php
new file mode 100644
index 0000000..8c80d0c
--- /dev/null
+++ b/tests/Nyholm/ResponseTest.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Http\Psr7Test\Tests\Nyholm;
+
+use Http\Psr7Test\ResponseIntegrationTest;
+use Nyholm\Psr7\Response;
+
+class ResponseTest extends ResponseIntegrationTest
+{
+    public function createSubject()
+    {
+        return new Response();
+    }
+}
diff --git a/tests/Nyholm/ServerRequestTest.php b/tests/Nyholm/ServerRequestTest.php
new file mode 100644
index 0000000..08bfc5a
--- /dev/null
+++ b/tests/Nyholm/ServerRequestTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Http\Psr7Test\Tests\Nyholm;
+
+use Http\Psr7Test\ServerRequestIntegrationTest;
+use Nyholm\Psr7\ServerRequest;
+
+class ServerRequestTest extends ServerRequestIntegrationTest
+{
+    public function createSubject()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        return new ServerRequest('GET', '/', [], null, '1.1', $_SERVER);
+    }
+}
diff --git a/tests/Nyholm/StreamTest.php b/tests/Nyholm/StreamTest.php
new file mode 100644
index 0000000..3543800
--- /dev/null
+++ b/tests/Nyholm/StreamTest.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Http\Psr7Test\Tests\Nyholm;
+
+use Http\Psr7Test\StreamIntegrationTest;
+use Nyholm\Psr7\Stream;
+
+class StreamTest extends StreamIntegrationTest
+{
+    public function createStream($data)
+    {
+        return Stream::create($data);
+    }
+}
diff --git a/tests/Nyholm/UploadedFileTest.php b/tests/Nyholm/UploadedFileTest.php
new file mode 100644
index 0000000..06e47ba
--- /dev/null
+++ b/tests/Nyholm/UploadedFileTest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Http\Psr7Test\Tests\Nyholm;
+
+use Http\Psr7Test\UploadedFileIntegrationTest;
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Nyholm\Psr7\Stream;
+
+class UploadedFileTest extends UploadedFileIntegrationTest
+{
+    public function createSubject()
+    {
+        return (new Psr17Factory())->createUploadedFile(Stream::create('writing to tempfile'));
+    }
+}
diff --git a/tests/Nyholm/UriTest.php b/tests/Nyholm/UriTest.php
new file mode 100644
index 0000000..00ca910
--- /dev/null
+++ b/tests/Nyholm/UriTest.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Http\Psr7Test\Tests\Nyholm;
+
+use Http\Psr7Test\UriIntegrationTest;
+use Nyholm\Psr7\Uri;
+
+class UriTest extends UriIntegrationTest
+{
+    public function createUri($uri)
+    {
+        return new Uri($uri);
+    }
+}

From 21b851a9439d95ceb1021a9c4a00cf12661b45f1 Mon Sep 17 00:00:00 2001
From: Florian Pisani <me@fpisani.dev>
Date: Fri, 28 May 2021 14:14:46 +0200
Subject: [PATCH 2/2] Updated phpunit.xml.dist to use Nyholm integration tests,
 not available in vendor folder

---
 phpunit.xml.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 5722406..bfe52d1 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -28,7 +28,7 @@
     </testsuite>
 
     <testsuite name="Nyholm">
-        <directory>./vendor/nyholm/psr7/tests/Integration/</directory>
+        <directory>./tests/Nyholm/</directory>
     </testsuite>
   </testsuites>