Merge 765fc2f into bb833f8

src/AbstractSerializer.php

@@ -12,6 +12,14 @@
 use Psr\Http\Message\StreamInterface;
 use UnexpectedValueException;
 
+use function array_pop;
+use function implode;
+use function ltrim;
+use function preg_match;
+use function sprintf;
+use function str_replace;
+use function ucwords;
+
 /**
  * Provides base functionality for request and response de/serialization
  * strategies, including functionality for retrieving a line at a time from

src/CallbackStream.php

@@ -10,8 +10,12 @@
 namespace Zend\Diactoros;
 
 use InvalidArgumentException;
-use RuntimeException;
 use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+
+use function array_key_exists;
+
+use const SEEK_SET;
 
 /**
  * Implementation of PSR HTTP streams

src/HeaderSecurity.php

@@ -9,6 +9,17 @@
 
 use InvalidArgumentException;
 
+use function get_class;
+use function gettype;
+use function in_array;
+use function is_numeric;
+use function is_object;
+use function is_string;
+use function ord;
+use function preg_match;
+use function sprintf;
+use function strlen;
+
 /**
  * Provide security tools around HTTP headers to prevent common injection vectors.
  *

src/MessageTrait.php

@@ -10,6 +10,19 @@
 use InvalidArgumentException;
 use Psr\Http\Message\StreamInterface;
 
+use function array_map;
+use function array_merge;
+use function get_class;
+use function gettype;
+use function implode;
+use function is_array;
+use function is_object;
+use function is_resource;
+use function is_string;
+use function preg_match;
+use function sprintf;
+use function strtolower;
+
 /**
  * Trait implementing the various methods defined in MessageInterface.
  *

src/PhpInputStream.php

@@ -7,6 +7,8 @@
 
 namespace Zend\Diactoros;
 
+use function stream_get_contents;
+
 /**
  * Caching version of php://input
  */

src/RelativeStream.php

@@ -10,6 +10,8 @@
 use Psr\Http\Message\StreamInterface;
 use RuntimeException;
 
+use const SEEK_SET;
+
 /**
  * Class RelativeStream
  *

src/Request.php

@@ -11,6 +11,8 @@
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
 
+use function strtolower;
+
 /**
  * HTTP Request encapsulation
  *

src/Request/ArraySerializer.php

@@ -12,6 +12,8 @@
 use Zend\Diactoros\Request;
 use Zend\Diactoros\Stream;
 
+use function sprintf;
+
 /**
  * Serialize or deserialize request messages to/from arrays.
  *

src/Request/Serializer.php

@@ -18,6 +18,9 @@
 use Zend\Diactoros\Stream;
 use Zend\Diactoros\Uri;
 
+use function preg_match;
+use function sprintf;
+
 /**
  * Serialize (cast to string) or deserialize (cast string to Request) messages.
  *

src/RequestTrait.php

@@ -11,6 +11,15 @@
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
 
+use function array_keys;
+use function get_class;
+use function gettype;
+use function is_object;
+use function is_string;
+use function preg_match;
+use function sprintf;
+use function strtolower;
+
 /**
  * Trait with common request behaviors.
  *

src/Response.php

@@ -11,6 +11,12 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 
+use function gettype;
+use function is_float;
+use function is_numeric;
+use function is_scalar;
+use function sprintf;
+
 /**
  * HTTP response encapsulation.
  *

src/Response/ArraySerializer.php

@@ -12,6 +12,8 @@
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Stream;
 
+use function sprintf;
+
 /**
  * Serialize or deserialize response messages to/from arrays.
  *

src/Response/HtmlResponse.php

@@ -14,6 +14,12 @@
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Stream;
 
+use function get_class;
+use function gettype;
+use function is_object;
+use function is_string;
+use function sprintf;
+
 /**
  * HTML response.
  *

src/Response/InjectContentTypeTrait.php

@@ -9,6 +9,10 @@
 
 namespace Zend\Diactoros\Response;
 
+use function array_keys;
+use function array_reduce;
+use function strtolower;
+
 trait InjectContentTypeTrait
 {
     /**

src/Response/JsonResponse.php

@@ -11,6 +11,15 @@
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Stream;
 
+use function is_object;
+use function is_resource;
+use function json_encode;
+use function json_last_error;
+use function json_last_error_msg;
+use function sprintf;
+
+use const JSON_ERROR_NONE;
+
 /**
  * JSON response.
  *

src/Response/RedirectResponse.php

@@ -13,6 +13,12 @@
 use Psr\Http\Message\UriInterface;
 use Zend\Diactoros\Response;
 
+use function get_class;
+use function gettype;
+use function is_object;
+use function is_string;
+use function sprintf;
+
 /**
  * Produce a redirect response.
  */

src/Response/SapiEmitter.php

@@ -8,7 +8,6 @@
 namespace Zend\Diactoros\Response;
 
 use Psr\Http\Message\ResponseInterface;
-use RuntimeException;
 
 class SapiEmitter implements EmitterInterface
 {

src/Response/SapiEmitterTrait.php

@@ -10,6 +10,12 @@
 use Psr\Http\Message\ResponseInterface;
 use RuntimeException;
 
+use function ob_get_length;
+use function ob_get_level;
+use function sprintf;
+use function str_replace;
+use function ucwords;
+
 trait SapiEmitterTrait
 {
     /**

src/Response/SapiStreamEmitter.php

@@ -8,8 +8,11 @@
 namespace Zend\Diactoros\Response;
 
 use Psr\Http\Message\ResponseInterface;
-use RuntimeException;
-use Zend\Diactoros\RelativeStream;
+
+use function is_array;
+use function preg_match;
+use function strlen;
+use function substr;
 
 class SapiStreamEmitter implements EmitterInterface
 {

src/Response/Serializer.php

@@ -15,6 +15,9 @@
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Stream;
 
+use function preg_match;
+use function sprintf;
+
 final class Serializer extends AbstractSerializer
 {
     /**

src/Response/TextResponse.php

@@ -14,6 +14,12 @@
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Stream;
 
+use function get_class;
+use function gettype;
+use function is_object;
+use function is_string;
+use function sprintf;
+
 /**
  * Plain text response.
  *

src/Response/XmlResponse.php

@@ -12,6 +12,12 @@
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Stream;
 
+use function get_class;
+use function gettype;
+use function is_object;
+use function is_string;
+use function sprintf;
+
 /**
  * XML response.
  *

src/Server.php

@@ -8,8 +8,10 @@
 namespace Zend\Diactoros;
 
 use OutOfBoundsException;
-use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+use function property_exists;
 
 /**
  * "Serve" incoming HTTP requests

src/ServerRequest.php

@@ -13,6 +13,9 @@
 use Psr\Http\Message\UploadedFileInterface;
 use Psr\Http\Message\UriInterface;
 
+use function array_key_exists;
+use function is_array;
+
 /**
  * Server-side HTTP request
  *

src/ServerRequestFactory.php

@@ -12,6 +12,29 @@
 use stdClass;
 use UnexpectedValueException;
 
+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/Stream.php

@@ -8,8 +8,30 @@
 namespace Zend\Diactoros;
 
 use InvalidArgumentException;
-use RuntimeException;
 use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+
+use function array_key_exists;
+use function fclose;
+use function feof;
+use function fopen;
+use function fread;
+use function fseek;
+use function fstat;
+use function ftell;
+use function fwrite;
+use function get_resource_type;
+use function is_int;
+use function is_resource;
+use function is_string;
+use function restore_error_handler;
+use function set_error_handler;
+use function stream_get_contents;
+use function stream_get_meta_data;
+use function strstr;
+
+use const E_WARNING;
+use const SEEK_SET;
 
 /**
  * Implementation of PSR HTTP streams

src/UploadedFile.php

@@ -12,6 +12,29 @@
 use Psr\Http\Message\UploadedFileInterface;
 use RuntimeException;
 
+use function dirname;
+use function fclose;
+use function fopen;
+use function fwrite;
+use function is_dir;
+use function is_int;
+use function is_resource;
+use function is_string;
+use function is_writable;
+use function move_uploaded_file;
+use function sprintf;
+use function strpos;
+
+use const PHP_SAPI;
+use const UPLOAD_ERR_CANT_WRITE;
+use const UPLOAD_ERR_EXTENSION;
+use const UPLOAD_ERR_FORM_SIZE;
+use const UPLOAD_ERR_INI_SIZE;
+use const UPLOAD_ERR_NO_FILE;
+use const UPLOAD_ERR_NO_TMP_DIR;
+use const UPLOAD_ERR_OK;
+use const UPLOAD_ERR_PARTIAL;
+
 class UploadedFile implements UploadedFileInterface
 {
     const ERROR_MESSAGES = [