Fixed error for HTTP/2.0 protocol signature

Protocol name according to RFC standards should be HTTP/2, but webservers also use HTTP/2.0
polymorphine · Dec 4, 2022 · 7ef23ff · 7ef23ff
1 parent a049305
commit 7ef23ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/MessageMethodsTrait.php b/src/MessageMethodsTrait.php
@@ -21,7 +21,7 @@ trait MessageMethodsTrait
     private string          $version;
     private array           $headers;
 
-    private array $supportedProtocolVersions = ['1.0', '1.1', '2'];
+    private array $supportedProtocolVersions = ['1.0', '1.1', '2', '2.0'];
 
     private array $headerNames = [];
 
@@ -200,7 +200,7 @@ private function legalHeaderStrings(array $headerValues): bool
     private function illegalHeaderChars(string $header): bool
     {
         $illegalCharset   = preg_match("/[^\t\r\n\x20-\x7E\x80-\xFE]/", $header);
-        $invalidLineBreak = preg_match("/(?:[^\r]\n|\r[^\n]|\n[^ \t])/", $header);
+        $invalidLineBreak = preg_match("/([^\r]\n|\r[^\n]|\n[^ \t])/", $header);
 
         return $illegalCharset || $invalidLineBreak;
     }

diff --git a/src/ServerData.php b/src/ServerData.php
@@ -97,9 +97,7 @@ public function uploadedFiles(): array
 
     private function protocolVersion(): string
     {
-        return isset($this->server['SERVER_PROTOCOL'])
-            ? explode('/', $this->server['SERVER_PROTOCOL'])[1]
-            : '1.1';
+        return substr($this->server['SERVER_PROTOCOL'] ?? 'HTTP/1.1', 5) ?: '1.1';
     }
 
     private function resolveUri(): UriInterface

diff --git a/tests/MessageMethodsTest.php b/tests/MessageMethodsTest.php
@@ -28,9 +28,11 @@ public function testInstantiatingMessage()
     public function testSetSupportedProtocolVersion()
     {
         $this->assertSame('2', $this->message([], '2')->getProtocolVersion());
+        $this->assertSame('2.0', $this->message([], '2.0')->getProtocolVersion());
         $this->assertSame('1.0', $this->message()->withProtocolVersion('1.0')->getProtocolVersion());
         $this->assertSame('1.1', $this->message()->withProtocolVersion('1.1')->getProtocolVersion());
         $this->assertSame('2', $this->message()->withProtocolVersion('2')->getProtocolVersion());
+        $this->assertSame('2.0', $this->message()->withProtocolVersion('2.0')->getProtocolVersion());
     }
 
     public function testProtocolVersionChange_ReturnsNewObject()