Merge branch 'hotfix/function_imports' into release-2.0

Conflicts:
	src/functions/marshal_headers_from_sapi.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/functions/parse_cookie_header.php

CHANGELOG.md

@@ -6,7 +6,24 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#307](https://github.com/zendframework/zend-diactoros/pull/307) adds the following functions under the `Zend\Diactoros` namespace, each of
+  which may be used to derive artifacts from SAPI supergloabls for the purposes
+  of generating a `ServerRequest` instance:
+  - `normalizeServer(array $server, callable $apacheRequestHeaderCallback = null) : array`
+    (main purpose is to aggregate the `Authorization` header in the SAPI params
+    when under Apache)
+  - `marshalProtocolVersionFromSapi(array $server) : string`
+  - `marshalMethodFromSapi(array $server) : string`
+  - `marshalUriFromSapi(array $server, array $headers) : Uri`
+  - `marshalHeadersFromSapi(array $server) : array`
+  - `parseCookieHeader(string $header) : array`
+  - `createUploadedFile(array $spec) : UploadedFile` (creates the instance from
+    a normal `$_FILES` entry)
+  - `normalizeUploadedFiles(array $files) : UploadedFileInterface[]` (traverses
+    a potentially nested array of uploaded file instances and/or `$_FILES`
+    entries, including those aggregated under mod_php, php-fpm, and php-cgi in
+    order to create a flat array of `UploadedFileInterface` instances to use in a
+    request)
 
 ### Changed
 

src/ServerRequestFactory.php

@@ -14,26 +14,13 @@
 
 use function array_change_key_case;
 use function array_key_exists;
-use function array_keys;
 use function explode;
 use function implode;
 use function is_array;
 use function is_callable;
-use function ltrim;
-use function preg_match;
-use function preg_match_all;
-use function preg_replace;
-use function sprintf;
-use function strlen;
-use function strpos;
-use function strrpos;
 use function strtolower;
-use function strtr;
-use function substr;
-use function urldecode;
 
 use const CASE_LOWER;
-use const PREG_SET_ORDER;
 
 /**
  * Class for marshaling a request object from the current PHP environment.

src/functions/marshal_headers_from_sapi.php

@@ -7,6 +7,12 @@
 
 namespace Zend\Diactoros;
 
+use function array_key_exists;
+use function strpos;
+use function strtolower;
+use function strtr;
+use function substr;
+
 /**
  * @param array $server Values obtained from the SAPI (generally `$_SERVER`).
  * @return array Header/value pairs

src/functions/marshal_protocol_version_from_sapi.php

@@ -9,6 +9,8 @@
 
 use UnexpectedValueException;
 
+use function preg_match;
+
 /**
  * Return HTTP protocol version (X.Y) as discovered within a `$_SERVER` array.
  *

src/functions/marshal_uri_from_sapi.php

@@ -7,6 +7,19 @@
 
 namespace Zend\Diactoros;
 
+use function array_change_key_case;
+use function array_key_exists;
+use function explode;
+use function implode;
+use function is_array;
+use function ltrim;
+use function preg_match;
+use function preg_replace;
+use function strlen;
+use function strpos;
+use function strtolower;
+use function substr;
+
 /**
  * Marshal a Uri instance based on the values presnt in the $_SERVER array and headers.
  *
@@ -168,7 +181,6 @@ function marshalUriFromSapi(array $server, array $headers)
     $uri = $uri->withScheme($scheme);
 
     // Set the host
-    $accumulator = (object) ['host' => '', 'port' => null];
     list($host, $port) = $marshalHostAndPort($headers, $server);
     if (! empty($host)) {
         $uri = $uri->withHost($host);

src/functions/normalize_server.php

@@ -7,6 +7,8 @@
 
 namespace Zend\Diactoros;
 
+use function is_callable;
+
 /**
  * Marshal the $_SERVER array
  *

src/functions/normalize_uploaded_files.php

@@ -10,6 +10,8 @@
 use InvalidArgumentException;
 use Psr\Http\Message\UploadedFileInterface;
 
+use function is_array;
+
 /**
  * Normalize uploaded files
  *

src/functions/parse_cookie_header.php

@@ -7,6 +7,9 @@
 
 namespace Zend\Diactoros;
 
+use function preg_match_all;
+use function urldecode;
+
 /**
  * Parse a cookie header according to RFC 6265.
  *