Private methods

- Updated `fromGlobals()` to pass `$server` instead of `$_SERVER` to
  `marshalProtocolVersion()`.
- Made `marshalProtocolVersion()` private (for consistency with other
  methods, and to reduce the public API)
  - Updated tests to use `ReflectionMethod` in order to directly test
    the new method.
- Fixed an issue discovered in one test; `marshalProtocolVersion()`
  needs to allow omission of the `HTTP/` prefix.

Author: weierophinney

src/ServerRequestFactory.php

@@ -71,7 +71,7 @@ public static function fromGlobals(
         );
 
         return $request
-            ->withProtocolVersion(static::marshalProtocolVersion($_SERVER))
+            ->withProtocolVersion(static::marshalProtocolVersion($server))
             ->withCookieParams($cookies ?: $_COOKIE)
             ->withQueryParams($query ?: $_GET)
             ->withParsedBody($body ?: $_POST);
@@ -464,14 +464,17 @@ private static function normalizeNestedFileSpec(array $files = [])
      * @param array $server
      * @return string
      */
-    public static function marshalProtocolVersion(array $server)
+    private static function marshalProtocolVersion(array $server)
     {
-        if (!isset($server['SERVER_PROTOCOL'])) {
+        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.');
+        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,6 +10,7 @@
 namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use ReflectionMethod;
 use ReflectionProperty;
 use UnexpectedValueException;
 use Zend\Diactoros\ServerRequest;
@@ -439,19 +440,25 @@ public function testNormalizeFilesReturnsOnlyActualFilesWhenOriginalFilesContain
 
     public function testMarshalProtocolVersionReturnsHttpVersion()
     {
-        $version = ServerRequestFactory::marshalProtocolVersion(['SERVER_PROTOCOL' => 'HTTP/1.0']);
+        $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');
-        ServerRequestFactory::marshalProtocolVersion(['SERVER_PROTOCOL' => 'dadsa/1.0']);
+        $method->invoke(null, ['SERVER_PROTOCOL' => 'dadsa/1.0']);
     }
 
     public function testMarshalProtocolReturnsDefaultValueIfHeaderIsNotPresent()
     {
-        $version = ServerRequestFactory::marshalProtocolVersion([]);
+        $method = new ReflectionMethod(ServerRequestFactory::class, 'marshalProtocolVersion');
+        $method->setAccessible(true);
+        $version = $method->invoke(null, []);
         $this->assertEquals('1.1', $version);
     }
 }