Consolidate functions for generating URI to a single exposed function

Moves `getHeaderFromArray()`, `marshalHostAndPort()`, and
`marshalIpv6HostAndPort()` into `marshalUriFromSapi()` as anonymous
functions, leaving only `marshalUriFromSapi()` exposed publicly; the
others are simply implementation details of that particular function.

Author: weierophinney

composer.json

@@ -39,11 +39,8 @@
   "autoload": {
     "files": [
         "src/functions/create_uploaded_file.php",
-        "src/functions/get_header_from_array.php",
         "src/functions/marshal_headers_from_sapi.php",
-        "src/functions/marshal_host_and_port.php",
         "src/functions/marshal_protocol_version.php",
-        "src/functions/marshal_request_path.php",
         "src/functions/marshal_uri_from_sapi.php",
         "src/functions/normalize_server.php",
         "src/functions/normalize_uploaded_files.php",

src/ServerRequestFactory.php

@@ -129,15 +129,22 @@ public static function get($key, array $values, $default = null)
      *
      * If not, the $default is returned.
      *
-     * @deprecated since 1.8.0; use Zend\Diactoros\getHeaderFromArray() instead.
+     * @deprecated since 1.8.0; no longer used internally.
      * @param string $header
      * @param array $headers
      * @param mixed $default
      * @return string
      */
     public static function getHeader($header, array $headers, $default = null)
     {
-        return getHeaderFromArray($header, $headers, $default);
+        $header  = strtolower($name);
+        $headers = array_change_key_case($headers, CASE_LOWER);
+        if (array_key_exists($header, $headers)) {
+            $value = is_array($headers[$header]) ? implode(', ', $headers[$header]) : $headers[$header];
+            return $value;
+        }
+
+        return $default;
     }
 
     /**
@@ -201,16 +208,18 @@ public static function marshalUriFromServer(array $server, array $headers)
     /**
      * Marshal the host and port from HTTP headers and/or the PHP environment
      *
-     * @deprecated since 1.8.0; use Zend\Diactoros\marshalHostAndPort instead.
+     * @deprecated since 1.8.0; use Zend\Diactoros\marshalUriFromSapi() instead,
+     *     and pull the host and port from the Uri instance that function
+     *     returns.
      * @param stdClass $accumulator
      * @param array $server
      * @param array $headers
      */
     public static function marshalHostAndPortFromHeaders(stdClass $accumulator, array $server, array $headers)
     {
-        list($host, $port) = marshalHostAndPort($headers, $server);
-        $accumulator->host = $host;
-        $accumulator->port = $port;
+        $uri = marshalUriFromSapi($server, $headers);
+        $accumulator->host = $uri->getHost();
+        $accumulator->port = $uri->getPort();
     }
 
     /**
@@ -219,14 +228,15 @@ public static function marshalHostAndPortFromHeaders(stdClass $accumulator, arra
      * Looks at a variety of criteria in order to attempt to autodetect a base
      * URI, including rewrite URIs, proxy URIs, etc.
      *
-     *
-     * @deprecated since 1.8.0; use Zend\Diactoros\marshalRequestPath() instead.
+     * @deprecated since 1.8.0; use Zend\Diactoros\marshalUriFromSapi() instead,
+     *     and pull the path from the Uri instance that function returns.
      * @param array $server
      * @return string
      */
     public static function marshalRequestUri(array $server)
     {
-        return marshalRequestPath($server);
+        $uri = marshalUriFromSapi($server, []);
+        return $uri->getPath();
     }
 
     /**