CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 2.2.2 - 2022-06-08
+
+### Fixed
+
+- Fix `Message::parseRequestUri()` for numeric headers
+- Re-wrap exceptions thrown in `fread` into runtime exceptions
+- Throw an exception when multipart options is misformatted
+
 ## 2.2.1 - 2022-03-20
 
 ### Fixed

README.md

@@ -807,6 +807,12 @@ Whether two URIs can be considered equivalent. Both URIs are normalized automati
 This of course assumes they will be resolved against the same base URI. If this is not the case, determination of
 equivalence or difference of relative references does not mean anything.
 
+## Version Guidance
+
+| Version | Status         | PHP Version      |
+|---------|----------------|------------------|
+| 1.x     | Security fixes | >= 5.4, < 8.2    |
+| 2.x     | Latest         | ^7.2.5 \|\| ^8.0 |
 
 ## Security
 

composer.json

@@ -87,9 +87,6 @@
             "bamarni/composer-bin-plugin": true
         },
         "preferred-install": "dist",
-        "sort-packages": true,
-        "allow-plugins": {
-            "bamarni/composer-bin-plugin": true
-        }
+        "sort-packages": true
     }
 }

src/Message.php

@@ -175,6 +175,9 @@ public static function parseMessage(string $message): array
     public static function parseRequestUri(string $path, array $headers): string
     {
         $hostKey = array_filter(array_keys($headers), function ($k) {
+            // Numeric array keys are converted to int by PHP.
+            $k = (string) $k;
+
             return strtolower($k) === 'host';
         });
 

src/MessageTrait.php

@@ -145,11 +145,9 @@ private function setHeaders(array $headers): void
     {
         $this->headerNames = $this->headers = [];
         foreach ($headers as $header => $value) {
-            if (is_int($header)) {
-                // Numeric array keys are converted to int by PHP but having a header name '123' is not forbidden by the spec
-                // and also allowed in withHeader(). So we need to cast it to string again for the following assertion to pass.
-                $header = (string) $header;
-            }
+            // Numeric array keys are converted to int by PHP.
+            $header = (string) $header;
+
             $this->assertHeader($header);
             $value = $this->normalizeHeaderValue($value);
             $normalized = strtolower($header);

src/MultipartStream.php

@@ -68,6 +68,9 @@ protected function createStream(array $elements = []): StreamInterface
         $stream = new AppendStream();
 
         foreach ($elements as $element) {
+            if (!is_array($element)) {
+                throw new \UnexpectedValueException("An array is expected");
+            }
             $this->addElement($stream, $element);
         }
 

src/Stream.php

@@ -229,7 +229,12 @@ public function read($length): string
             return '';
         }
 
-        $string = fread($this->stream, $length);
+        try {
+            $string = fread($this->stream, $length);
+        } catch (\Exception $e) {
+            throw new \RuntimeException('Unable to read from stream', 0, $e);
+        }
+
         if (false === $string) {
             throw new \RuntimeException('Unable to read from stream');
         }

tests/MessageTest.php

@@ -126,6 +126,21 @@ public function testParsesRequestMessagesWithCustomMethod(): void
         self::assertSame('GET_DATA', $request->getMethod());
     }
 
+    public function testParsesRequestMessagesWithNumericHeader(): void
+    {
+        $req = "GET /abc HTTP/1.0\r\nHost: foo.com\r\nFoo: Bar\r\nBaz: Bam\r\nBaz: Qux\r\n123: 456\r\n\r\nTest";
+        $request = Psr7\Message::parseRequest($req);
+        self::assertSame('GET', $request->getMethod());
+        self::assertSame('/abc', $request->getRequestTarget());
+        self::assertSame('1.0', $request->getProtocolVersion());
+        self::assertSame('foo.com', $request->getHeaderLine('Host'));
+        self::assertSame('Bar', $request->getHeaderLine('Foo'));
+        self::assertSame('Bam, Qux', $request->getHeaderLine('Baz'));
+        self::assertSame('456', $request->getHeaderLine('123'));
+        self::assertSame('Test', (string)$request->getBody());
+        self::assertSame('http://foo.com/abc', (string)$request->getUri());
+    }
+
     public function testParsesRequestMessagesWithFoldedHeadersOnHttp10(): void
     {
         $req = "PUT / HTTP/1.0\r\nFoo: Bar\r\n Bam\r\n\r\n";

tests/StreamTest.php

@@ -4,7 +4,9 @@
 
 namespace GuzzleHttp\Tests\Psr7;
 
+use GuzzleHttp\Psr7\FnStream;
 use GuzzleHttp\Psr7\Stream;
+use GuzzleHttp\Psr7\StreamWrapper;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -255,7 +257,7 @@ public function testStreamReadingWithNegativeLength(): void
         $stream->close();
     }
 
-    public function testStreamReadingFreadError(): void
+    public function testStreamReadingFreadFalse(): void
     {
         self::$isFReadError = true;
         $r = fopen('php://temp', 'r');
@@ -275,6 +277,30 @@ public function testStreamReadingFreadError(): void
         $stream->close();
     }
 
+    public function testStreamReadingFreadException(): void
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Unable to read from stream');
+
+        $r = StreamWrapper::getResource(new FnStream([
+            'read' => function ($len): string {
+                throw new \ErrorException('Some error');
+            },
+            'isReadable' => function (): bool {
+                return true;
+            },
+            'isWritable' => function (): bool {
+                return false;
+            },
+            'eof' => function (): bool {
+                return false;
+            }
+        ]));
+
+        $stream = new Stream($r);
+        $stream->read(1);
+    }
+
     /**
      * @requires extension zlib
      *