Merge branch 'hotfix/160'

Close #160

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.3.5 - TBD
+## 1.3.5 - 2016-03-17
 
 ### Added
 
@@ -18,7 +18,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#160](https://github.com/zendframework/zend-diactoros/pull/160) fixes HTTP
+  protocol detection in the `ServerRequestFactory` to work correctly with HTTP/2.
 
 ## 1.3.4 - 2016-03-17
 

src/ServerRequestFactory.php

@@ -470,7 +470,7 @@ private static function marshalProtocolVersion(array $server)
             return '1.1';
         }
 
-        if (! preg_match('#^(HTTP/)?(?P<version>[1-9]\d*\.\d)$#', $server['SERVER_PROTOCOL'], $matches)) {
+        if (! preg_match('#^(HTTP/)?(?P<version>[1-9]\d*(?:\.\d)?)$#', $server['SERVER_PROTOCOL'], $matches)) {
             throw new UnexpectedValueException(sprintf(
                 'Unrecognized protocol version (%s)',
                 $server['SERVER_PROTOCOL']

test/ServerRequestFactoryTest.php

@@ -454,14 +454,6 @@ public function testNormalizeFilesReturnsOnlyActualFilesWhenOriginalFilesContain
         $this->assertCount(1, $normalizedFiles['fooFiles']);
     }
 
-    public function testMarshalProtocolVersionReturnsHttpVersion()
-    {
-        $method = new ReflectionMethod('Zend\Diactoros\ServerRequestFactory', 'marshalProtocolVersion');
-        $method->setAccessible(true);
-        $version = $method->invoke(null, ['SERVER_PROTOCOL' => 'HTTP/1.0']);
-        $this->assertEquals('1.0', $version);
-    }
-
     public function testMarshalProtocolVersionRisesExceptionIfVersionIsNotRecognized()
     {
         $method = new ReflectionMethod('Zend\Diactoros\ServerRequestFactory', 'marshalProtocolVersion');
@@ -477,4 +469,24 @@ public function testMarshalProtocolReturnsDefaultValueIfHeaderIsNotPresent()
         $version = $method->invoke(null, []);
         $this->assertEquals('1.1', $version);
     }
+
+    /**
+     * @dataProvider marshalProtocolVersionProvider
+     */
+    public function testMarshalProtocolVersionReturnsHttpVersions($protocol, $expected)
+    {
+        $method = new ReflectionMethod('Zend\Diactoros\ServerRequestFactory', 'marshalProtocolVersion');
+        $method->setAccessible(true);
+        $version = $method->invoke(null, ['SERVER_PROTOCOL' => $protocol]);
+        $this->assertEquals($expected, $version);
+    }
+
+    public function marshalProtocolVersionProvider()
+    {
+        return [
+            'HTTP/1.0' => ['HTTP/1.0', '1.0'],
+            'HTTP/1.1' => ['HTTP/1.1', '1.1'],
+            'HTTP/2'   => ['HTTP/2', '2'],
+        ];
+    }
 }