Merge pull request #122 from mtymek/parse_protocol_version

Parse protocol version

Author: weierophinney

src/ServerRequestFactory.php

@@ -14,6 +14,7 @@
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\UploadedFileInterface;
 use stdClass;
+use UnexpectedValueException;
 
 /**
  * Class for marshaling a request object from the current PHP environment.
@@ -70,6 +71,7 @@ public static function fromGlobals(
         );
 
         return $request
+            ->withProtocolVersion(static::marshalProtocolVersion($_SERVER))
             ->withCookieParams($cookies ?: $_COOKIE)
             ->withQueryParams($query ?: $_GET)
             ->withParsedBody($body ?: $_POST);
@@ -455,4 +457,23 @@ private static function normalizeNestedFileSpec(array $files = [])
         }
         return $normalizedFiles;
     }
+
+    /**
+     * Return HTTP protocol version (X.Y)
+     *
+     * @param array $server
+     * @return string
+     */
+    public static function marshalProtocolVersion(array $server)
+    {
+        if (!isset($server['SERVER_PROTOCOL'])) {
+            return '1.1';
+        }
+
+        if (!preg_match('#^HTTP/(?P<version>[1-9]\d*\.\d)$#', $server['SERVER_PROTOCOL'], $matches)) {
+            throw new UnexpectedValueException('Unrecognized protocol version.');
+        }
+
+        return $matches['version'];
+    }
 }

test/ServerRequestFactoryTest.php

@@ -11,6 +11,7 @@
 
 use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionProperty;
+use UnexpectedValueException;
 use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\UploadedFile;
@@ -372,6 +373,7 @@ public function testCanCreateServerRequestViaFromGlobalsMethod()
         $this->assertEquals($body, $request->getParsedBody());
         $this->assertEquals($expectedFiles, $request->getUploadedFiles());
         $this->assertEmpty($request->getAttributes());
+        $this->assertEquals('1.1', $request->getProtocolVersion());
     }
 
     public function testNormalizeServerUsesMixedCaseAuthorizationHeaderFromApacheWhenPresent()
@@ -434,4 +436,22 @@ public function testNormalizeFilesReturnsOnlyActualFilesWhenOriginalFilesContain
 
         $this->assertCount(1, $normalizedFiles['fooFiles']);
     }
+
+    public function testMarshalProtocolVersionReturnsHttpVersion()
+    {
+        $version = ServerRequestFactory::marshalProtocolVersion(['SERVER_PROTOCOL' => 'HTTP/1.0']);
+        $this->assertEquals('1.0', $version);
+    }
+
+    public function testMarshalProtocolVersionRisesExceptionIfVersionIsNotRecognized()
+    {
+        $this->setExpectedException('UnexpectedValueException');
+        ServerRequestFactory::marshalProtocolVersion(['SERVER_PROTOCOL' => 'dadsa/1.0']);
+    }
+
+    public function testMarshalProtocolReturnsDefaultValueIfHeaderIsNotPresent()
+    {
+        $version = ServerRequestFactory::marshalProtocolVersion([]);
+        $this->assertEquals('1.1', $version);
+    }
 }