Renames marshalProtocolVersion() to marshalProtocolVersionFromSapi()

Naming consistency.

Author: weierophinney

composer.json

@@ -40,7 +40,7 @@
     "files": [
         "src/functions/create_uploaded_file.php",
         "src/functions/marshal_headers_from_sapi.php",
-        "src/functions/marshal_protocol_version.php",
+        "src/functions/marshal_protocol_version_from_sapi.php",
         "src/functions/marshal_uri_from_sapi.php",
         "src/functions/normalize_server.php",
         "src/functions/normalize_uploaded_files.php",

src/ServerRequestFactory.php

@@ -98,7 +98,7 @@ public static function fromGlobals(
             $cookies ?: $_COOKIE,
             $query ?: $_GET,
             $body ?: $_POST,
-            marshalProtocolVersion($server)
+            marshalProtocolVersionFromSapi($server)
         );
     }
 

src/functions/marshal_protocol_version.php renamed to src/functions/marshal_protocol_version_from_sapi.php

@@ -17,7 +17,7 @@
  * @throws UnexpectedValueException if the $server['SERVER_PROTOCOL'] value is
  *     malformed.
  */
-function marshalProtocolVersion(array $server)
+function marshalProtocolVersionFromSapi(array $server)
 {
     if (! isset($server['SERVER_PROTOCOL'])) {
         return '1.1';

test/ServerRequestFactoryTest.php

@@ -17,7 +17,7 @@
 use Zend\Diactoros\Uri;
 
 use function Zend\Diactoros\marshalHeadersFromSapi;
-use function Zend\Diactoros\marshalProtocolVersion;
+use function Zend\Diactoros\marshalProtocolVersionFromSapi;
 use function Zend\Diactoros\marshalUriFromSapi;
 use function Zend\Diactoros\normalizeServer;
 use function Zend\Diactoros\normalizeUploadedFiles;
@@ -562,12 +562,12 @@ public function testNormalizeFilesReturnsOnlyActualFilesWhenOriginalFilesContain
     public function testMarshalProtocolVersionRisesExceptionIfVersionIsNotRecognized()
     {
         $this->expectException(UnexpectedValueException::class);
-        marshalProtocolVersion(['SERVER_PROTOCOL' => 'dadsa/1.0']);
+        marshalProtocolVersionFromSapi(['SERVER_PROTOCOL' => 'dadsa/1.0']);
     }
 
     public function testMarshalProtocolReturnsDefaultValueIfHeaderIsNotPresent()
     {
-        $version = marshalProtocolVersion([]);
+        $version = marshalProtocolVersionFromSapi([]);
         $this->assertSame('1.1', $version);
     }
 
@@ -576,7 +576,7 @@ public function testMarshalProtocolReturnsDefaultValueIfHeaderIsNotPresent()
      */
     public function testMarshalProtocolVersionReturnsHttpVersions($protocol, $expected)
     {
-        $version = marshalProtocolVersion(['SERVER_PROTOCOL' => $protocol]);
+        $version = marshalProtocolVersionFromSapi(['SERVER_PROTOCOL' => $protocol]);
         $this->assertSame($expected, $version);
     }