Merge branch 'hotfix/122'

Close #122

Author: weierophinney

CHANGELOG.md

@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#122](https://github.com/zendframework/zend-diactoros/pull/122) updates the
+  `ServerRequestFactory` to retrieve the HTTP protocol version and inject it in
+  the generated `ServerRequest`, which previously was not performed.
 
 ## 1.3.1 - 2015-12-16
 

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,26 @@ private static function normalizeNestedFileSpec(array $files = [])
         }
         return $normalizedFiles;
     }
+
+    /**
+     * Return HTTP protocol version (X.Y)
+     *
+     * @param array $server
+     * @return string
+     */
+    private 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(sprintf(
+                'Unrecognized protocol version (%s)',
+                $server['SERVER_PROTOCOL']
+            ));
+        }
+
+        return $matches['version'];
+    }
 }

test/ServerRequestFactoryTest.php

@@ -10,7 +10,9 @@
 namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use ReflectionMethod;
 use ReflectionProperty;
+use UnexpectedValueException;
 use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\UploadedFile;
@@ -372,6 +374,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 +437,28 @@ public function testNormalizeFilesReturnsOnlyActualFilesWhenOriginalFilesContain
 
         $this->assertCount(1, $normalizedFiles['fooFiles']);
     }
+
+    public function testMarshalProtocolVersionReturnsHttpVersion()
+    {
+        $method = new ReflectionMethod(ServerRequestFactory::class, 'marshalProtocolVersion');
+        $method->setAccessible(true);
+        $version = $method->invoke(null, ['SERVER_PROTOCOL' => 'HTTP/1.0']);
+        $this->assertEquals('1.0', $version);
+    }
+
+    public function testMarshalProtocolVersionRisesExceptionIfVersionIsNotRecognized()
+    {
+        $method = new ReflectionMethod(ServerRequestFactory::class, 'marshalProtocolVersion');
+        $method->setAccessible(true);
+        $this->setExpectedException('UnexpectedValueException');
+        $method->invoke(null, ['SERVER_PROTOCOL' => 'dadsa/1.0']);
+    }
+
+    public function testMarshalProtocolReturnsDefaultValueIfHeaderIsNotPresent()
+    {
+        $method = new ReflectionMethod(ServerRequestFactory::class, 'marshalProtocolVersion');
+        $method->setAccessible(true);
+        $version = $method->invoke(null, []);
+        $this->assertEquals('1.1', $version);
+    }
 }