[1.x] Support PSR-7 v2 along side v1

This changeset introduces our PSR-7 v2 implementation alongside our PSR-7 v1 implementation and goes with v1 or v2 depending on which `psr/http-message` version is installed. This is admittedly not my best code, nor am I proud of it, but it gets the job done.

This relies on clue/reactphp-http-proxy#65 being merged first.

Implements reactphp#513 for `react/http` v1.

Author: WyriHaximus

composer.json

@@ -29,17 +29,17 @@
         "php": ">=5.3.0",
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
         "fig/http-message-util": "^1.1",
-        "psr/http-message": "^1.0",
+        "psr/http-message": "^2.0 || ^1.0",
         "react/event-loop": "^1.2",
         "react/promise": "^3.2 || ^2.3 || ^1.2.1",
         "react/socket": "^1.16",
         "react/stream": "^1.4"
     },
     "require-dev": {
-        "clue/http-proxy-react": "^1.8",
+        "clue/http-proxy-react": "^1.10",
         "clue/reactphp-ssh-proxy": "^1.4",
         "clue/socks-react": "^1.4",
-        "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+        "phpunit/phpunit": "^9.6 || ^8.5 || ^5.7 || ^4.8.36",
         "react/async": "^4.2 || ^3 || ^2",
         "react/promise-stream": "^1.4",
         "react/promise-timer": "^1.11"

phpunit.xml.dist

@@ -18,6 +18,7 @@
         </include>
     </coverage>
     <php>
+        <ini name="memory_limit" value="-1" />
         <ini name="error_reporting" value="-1" />
         <!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
         <!-- <ini name="zend.assertions" value="1" /> -->

phpunit.xml.legacy

@@ -16,6 +16,7 @@
         </whitelist>
     </filter>
     <php>
+        <ini name="memory_limit" value="-1" />
         <ini name="error_reporting" value="-1" />
         <!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
         <!-- <ini name="zend.assertions" value="1" /> -->

src/Io/AbstractMessage.php

@@ -5,6 +5,7 @@
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\StreamInterface;
 
+if (PHP_VERSION_ID < 70000 || !(new \ReflectionMethod('\Psr\Http\Message\MessageInterface','withProtocolVersion'))->hasReturnType()) {
 /**
  * [Internal] Abstract HTTP message base class (PSR-7)
  *
@@ -170,3 +171,6 @@ public function withBody(StreamInterface $body)
         return $message;
     }
 }
+} else {
+    class_alias(__NAMESPACE__ . '\\V2\\AbstractMessage', __NAMESPACE__ . '\\AbstractMessage');
+}

src/Io/AbstractRequest.php

@@ -7,6 +7,7 @@
 use Psr\Http\Message\UriInterface;
 use React\Http\Message\Uri;
 
+if (PHP_VERSION_ID < 70000 || !(new \ReflectionMethod('\Psr\Http\Message\RequestInterface','withRequestTarget'))->hasReturnType()) {
 /**
  * [Internal] Abstract HTTP request base class (PSR-7)
  *
@@ -154,3 +155,6 @@ public function withUri(UriInterface $uri, $preserveHost = false)
         return $request;
     }
 }
+} else {
+    class_alias(__NAMESPACE__ . '\\V2\\AbstractRequest', __NAMESPACE__ . '\\AbstractRequest');
+}

src/Io/BufferedBody.php

@@ -4,6 +4,7 @@
 
 use Psr\Http\Message\StreamInterface;
 
+if (PHP_VERSION_ID < 70000 || !(new \ReflectionMethod('\Psr\Http\Message\StreamInterface','eof'))->hasReturnType()) {
 /**
  * [Internal] PSR-7 message body implementation using an in-memory buffer
  *
@@ -177,3 +178,6 @@ public function getMetadata($key = null)
         return $key === null ? array() : null;
     }
 }
+} else {
+    class_alias(__NAMESPACE__ . '\\V2\\BufferedBody', __NAMESPACE__ . '\\BufferedBody');
+}

src/Io/EmptyBodyStream.php

@@ -8,6 +8,7 @@
 use React\Stream\Util;
 use React\Stream\WritableStreamInterface;
 
+if (PHP_VERSION_ID < 70000 || !(new \ReflectionMethod('\Psr\Http\Message\StreamInterface','eof'))->hasReturnType()) {
 /**
  * [Internal] Bridge between an empty StreamInterface from PSR-7 and ReadableStreamInterface from ReactPHP
  *
@@ -140,3 +141,6 @@ public function getMetadata($key = null)
         return ($key === null) ? array() : null;
     }
 }
+} else {
+    class_alias(__NAMESPACE__ . '\\V2\\EmptyBodyStream', __NAMESPACE__ . '\\EmptyBodyStream');
+}

src/Io/HttpBodyStream.php

@@ -8,6 +8,7 @@
 use React\Stream\Util;
 use React\Stream\WritableStreamInterface;
 
+if (PHP_VERSION_ID < 70000 || !(new \ReflectionMethod('\Psr\Http\Message\StreamInterface','eof'))->hasReturnType()) {
 /**
  * [Internal] Bridge between StreamInterface from PSR-7 and ReadableStreamInterface from ReactPHP
  *
@@ -180,3 +181,6 @@ public function handleEnd()
         }
     }
 }
+} else {
+    class_alias(__NAMESPACE__ . '\\V2\\HttpBodyStream', __NAMESPACE__ . '\\HttpBodyStream');
+}

src/Io/ReadableBodyStream.php

@@ -8,6 +8,8 @@
 use React\Stream\Util;
 use React\Stream\WritableStreamInterface;
 
+$reflectedMethod = new \ReflectionMethod('\Psr\Http\Message\StreamInterface','eof');
+if (!(PHP_VERSION_ID >= 70000 && $reflectedMethod->hasReturnType())) {
 /**
  * @internal
  */
@@ -151,3 +153,6 @@ public function handleEnd()
         $this->close();
     }
 }
+} else {
+    class_alias(__NAMESPACE__ . '\\V2\\ReadableBodyStream', __NAMESPACE__ . '\\ReadableBodyStream');
+}

src/Io/UploadedFile.php

@@ -7,6 +7,7 @@
 use InvalidArgumentException;
 use RuntimeException;
 
+if (PHP_VERSION_ID < 70000 || !(new \ReflectionMethod('\Psr\Http\Message\UploadedFileInterface','getStream'))->hasReturnType()) {
 /**
  * [Internal] Implementation of the PSR-7 `UploadedFileInterface`
  *
@@ -128,3 +129,6 @@ public function getClientMediaType()
         return $this->mediaType;
     }
 }
+} else {
+    class_alias(__NAMESPACE__ . '\\V2\\UploadedFile', __NAMESPACE__ . '\\UploadedFile');
+}