feat: update to v2 usage of PSR-7

Refactors tests that were using the assumption of throwing an `InvalidArgumentException` to test for either `InvalidArgumentException` OR `TypeError`.
This change will allow testing against PSR-7 1.1+ releases safely.

Author: weierophinney

composer.json

@@ -16,14 +16,14 @@
     "require": {
         "php": "^7.2 || ^8.0",
         "phpunit/phpunit": "^8.0 || ^9.3",
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.0 || ^2.0"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.7 || ^2.0",
         "laminas/laminas-diactoros": "^2.1",
         "nyholm/psr7": "^1.0",
         "ringcentral/psr7": "^1.2",
-        "slim/psr7": "dev-master"
+        "slim/psr7": "^1.4"
     },
     "extra": {
         "branch-alias": {

src/MessageTrait.php

@@ -2,7 +2,10 @@
 
 namespace Http\Psr7Test;
 
+use InvalidArgumentException;
 use Psr\Http\Message\MessageInterface;
+use Throwable;
+use TypeError;
 
 /**
  * Test MessageInterface.
@@ -136,9 +139,19 @@ public function testWithHeaderInvalidArguments($name, $value)
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
-        $this->expectException(\InvalidArgumentException::class);
-        $initialMessage = $this->getMessage();
-        $initialMessage->withHeader($name, $value);
+
+        try {
+            $initialMessage = $this->getMessage();
+            $initialMessage->withHeader($name, $value);
+        } catch (TypeError|InvalidArgumentException $e) {
+            // valid
+        } catch (Throwable $e) {
+            // invalid
+            $this->fail(sprintf(
+                'Unexpected exception (%s) thrown from withHeader(); expected TypeError or InvalidArgumentException',
+                gettype($e)
+            ));
+        }
     }
 
     public function getInvalidHeaderArguments()
@@ -154,6 +167,7 @@ public function getInvalidHeaderArguments()
         ];
     }
 
+
     public function testWithAddedHeader()
     {
         if (isset($this->skippedTests[__FUNCTION__])) {
@@ -174,9 +188,19 @@ public function testWithAddedHeaderInvalidArguments($name, $value)
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
-        $this->expectException(\InvalidArgumentException::class);
-        $initialMessage = $this->getMessage();
-        $initialMessage->withAddedHeader($name, $value);
+
+        try {
+            $initialMessage = $this->getMessage();
+            $initialMessage->withAddedHeader($name, $value);
+        } catch (TypeError|InvalidArgumentException $e) {
+            // valid
+        } catch (Throwable $e) {
+            // invalid
+            $this->fail(sprintf(
+                'Unexpected exception (%s) thrown from withAddedHeader(); expected TypeError or InvalidArgumentException',
+                gettype($e)
+            ));
+        }
     }
 
     /**

src/RequestIntegrationTest.php

@@ -2,8 +2,11 @@
 
 namespace Http\Psr7Test;
 
+use InvalidArgumentException;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
+use Throwable;
+use TypeError;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -96,8 +99,17 @@ public function testMethodWithInvalidArguments($method)
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $this->expectException(\InvalidArgumentException::class);
-        $this->request->withMethod($method);
+        try {
+            $this->request->withMethod($method);
+        } catch (InvalidArgumentException|TypeError $e) {
+            // valid
+        } catch (Throwable $e) {
+            // invalid
+            $this->fail(sprintf(
+                'Unexpected exception (%s) thrown from withMethod(); expected TypeError or InvalidArgumentException',
+                gettype($e)
+            ));
+        }
     }
 
     public function getInvalidMethods()

src/ResponseIntegrationTest.php

@@ -2,7 +2,10 @@
 
 namespace Http\Psr7Test;
 
+use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
+use Throwable;
+use TypeError;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -58,8 +61,17 @@ public function testStatusCodeInvalidArgument($statusCode)
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $this->expectException(\InvalidArgumentException::class);
-        $this->response->withStatus($statusCode);
+        try {
+            $this->response->withStatus($statusCode);
+        } catch (InvalidArgumentException|TypeError $e) {
+            // valid
+        } catch (Throwable $e) {
+            // invalid
+            $this->fail(sprintf(
+                'Unexpected exception (%s) thrown from withStatus(); expected TypeError or InvalidArgumentException',
+                gettype($e)
+            ));
+        }
     }
 
     public function getInvalidStatusCodeArguments()

src/UriIntegrationTest.php

@@ -2,7 +2,10 @@
 
 namespace Http\Psr7Test;
 
+use InvalidArgumentException;
 use Psr\Http\Message\UriInterface;
+use Throwable;
+use TypeError;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -47,8 +50,17 @@ public function testWithSchemeInvalidArguments($schema)
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $this->expectException(\InvalidArgumentException::class);
-        $this->createUri('/')->withScheme($schema);
+        try {
+            $this->createUri('/')->withScheme($schema);
+        } catch (InvalidArgumentException|TypeError $e) {
+            // valid
+        } catch (Throwable $e) {
+            // invalid
+            $this->fail(sprintf(
+                'Unexpected exception (%s) thrown from withScheme(); expected TypeError or InvalidArgumentException',
+                gettype($e)
+            ));
+        }
     }
 
     public function getInvalidSchemaArguments()