Import internal functions and constants + optimize imports

src/Container/ApplicationConfigInjectionDelegator.php

@@ -13,11 +13,20 @@
 use SplPriorityQueue;
 use Zend\Expressive\Application;
 use Zend\Expressive\Exception\InvalidArgumentException;
-use Zend\Expressive\Router\Middleware\DispatchMiddleware;
-use Zend\Expressive\Router\Middleware\MethodNotAllowedMiddleware;
-use Zend\Expressive\Router\Middleware\PathBasedRoutingMiddleware;
 use Zend\Expressive\Router\Route;
 
+use function array_key_exists;
+use function array_map;
+use function array_reduce;
+use function get_class;
+use function gettype;
+use function is_array;
+use function is_int;
+use function is_object;
+use function sprintf;
+
+use const PHP_INT_MAX;
+
 class ApplicationConfigInjectionDelegator
 {
     /**

src/Container/ResponseFactoryFactory.php

@@ -13,6 +13,9 @@
 use Psr\Http\Message\ResponseInterface;
 use Zend\Diactoros\Response;
 
+use function class_exists;
+use function sprintf;
+
 /**
  * Produces a callable capable of producing a response prototype for use with
  * services that need to produce a response.

src/Container/ServerRequestErrorResponseGeneratorFactory.php

@@ -11,7 +11,6 @@
 
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
-use Zend\Expressive\Middleware\ErrorResponseGenerator;
 use Zend\Expressive\Response\ServerRequestErrorResponseGenerator;
 use Zend\Expressive\Template\TemplateRendererInterface;
 

src/Container/ServerRequestFactoryFactory.php

@@ -13,6 +13,9 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\ServerRequestFactory;
 
+use function class_exists;
+use function sprintf;
+
 /**
  * Return a factory for generating a server request.
  *

src/Container/StreamFactoryFactory.php

@@ -13,6 +13,9 @@
 use Psr\Http\Message\StreamInterface;
 use Zend\Diactoros\Stream;
 
+use function class_exists;
+use function sprintf;
+
 /**
  * Produces a callable capable of producing an empty stream for use with
  * services that need to produce a stream for use with a request or a response.

src/Container/WhoopsFactory.php

@@ -14,6 +14,8 @@
 use Whoops\Run as Whoops;
 use Whoops\Util\Misc as WhoopsUtil;
 
+use function method_exists;
+
 /**
  * Create and return an instance of the Whoops runner.
  *

src/Container/WhoopsPageHandlerFactory.php

@@ -12,6 +12,13 @@
 use Psr\Container\ContainerInterface;
 use Whoops\Handler\PrettyPageHandler;
 
+use function get_class;
+use function gettype;
+use function is_callable;
+use function is_object;
+use function is_string;
+use function sprintf;
+
 /**
  * Create and return an instance of the whoops PrettyPageHandler.
  *

src/Exception/ContainerNotRegisteredException.php

@@ -11,6 +11,8 @@
 
 use RuntimeException;
 
+use function sprintf;
+
 class ContainerNotRegisteredException extends RuntimeException implements ExceptionInterface
 {
     public static function forMiddlewareService(string $middleware) : self

src/Exception/InvalidMiddlewareException.php

@@ -14,6 +14,11 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use RuntimeException;
 
+use function get_class;
+use function gettype;
+use function is_object;
+use function sprintf;
+
 class InvalidMiddlewareException extends RuntimeException implements
     ContainerExceptionInterface,
     ExceptionInterface

src/Exception/MissingDependencyException.php

@@ -12,6 +12,8 @@
 use Psr\Container\ContainerExceptionInterface;
 use RuntimeException;
 
+use function sprintf;
+
 class MissingDependencyException extends RuntimeException implements
     ContainerExceptionInterface,
     ExceptionInterface

src/Handler/NotFoundHandler.php

@@ -15,6 +15,8 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Expressive\Template\TemplateRendererInterface;
 
+use function sprintf;
+
 class NotFoundHandler implements RequestHandlerInterface
 {
     public const TEMPLATE_DEFAULT = 'error::404';

src/Middleware/WhoopsErrorResponseGenerator.php

@@ -19,6 +19,12 @@
 use Whoops\RunInterface;
 use Zend\Stratigility\Utils;
 
+use function get_class;
+use function gettype;
+use function is_object;
+use function method_exists;
+use function sprintf;
+
 class WhoopsErrorResponseGenerator
 {
     /**

src/MiddlewareContainer.php

@@ -14,6 +14,8 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Stratigility\Middleware\RequestHandlerMiddleware;
 
+use function class_exists;
+
 class MiddlewareContainer implements ContainerInterface
 {
     /**

src/MiddlewareFactory.php

@@ -15,6 +15,12 @@
 use Zend\Stratigility\Middleware\RequestHandlerMiddleware;
 use Zend\Stratigility\MiddlewarePipe;
 
+use function array_shift;
+use function count;
+use function is_array;
+use function is_callable;
+use function is_string;
+
 /**
  * Marshal middleware for use in the application.
  *

src/Response/ErrorResponseGeneratorTrait.php

@@ -13,6 +13,9 @@
 use Throwable;
 use Zend\Expressive\Template\TemplateRendererInterface;
 
+use function get_class;
+use function sprintf;
+
 trait ErrorResponseGeneratorTrait
 {
     /**

test/ApplicationTest.php

@@ -26,6 +26,10 @@
 use Zend\Stratigility\MiddlewarePipe;
 use Zend\Stratigility\MiddlewarePipeInterface;
 
+use function array_unshift;
+use function sprintf;
+use function strtoupper;
+
 class ApplicationTest extends TestCase
 {
     public function setUp()

test/ConfigProviderTest.php

@@ -28,6 +28,11 @@
 use Zend\ServiceManager\ServiceManager;
 use Zend\Stratigility\Middleware\ErrorHandler;
 
+use function array_merge_recursive;
+use function file_get_contents;
+use function json_decode;
+use function sprintf;
+
 use const Zend\Expressive\DEFAULT_DELEGATE;
 use const Zend\Expressive\DISPATCH_MIDDLEWARE;
 use const Zend\Expressive\IMPLICIT_HEAD_MIDDLEWARE;

test/Container/ApplicationConfigInjectionDelegatorTest.php

@@ -15,12 +15,10 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use ReflectionProperty;
-use Zend\Diactoros\Response;
 use Zend\Expressive\Application;
 use Zend\Expressive\Container\ApplicationConfigInjectionDelegator;
 use Zend\Expressive\Container\Exception\InvalidServiceException;
 use Zend\Expressive\Exception\InvalidArgumentException;
-use Zend\Expressive\Middleware;
 use Zend\Expressive\MiddlewareContainer;
 use Zend\Expressive\MiddlewareFactory;
 use Zend\Expressive\Router\Middleware\DispatchMiddleware;
@@ -34,6 +32,10 @@
 use ZendTest\Expressive\ContainerTrait;
 use ZendTest\Expressive\TestAsset\InvokableMiddleware;
 
+use function array_merge;
+use function array_reduce;
+use function array_shift;
+
 class ApplicationConfigInjectionDelegatorTest extends TestCase
 {
     use ContainerTrait;

test/Container/EmitterFactoryTest.php

@@ -14,6 +14,9 @@
 use Zend\HttpHandlerRunner\Emitter\EmitterStack;
 use Zend\HttpHandlerRunner\Emitter\SapiEmitter;
 
+use function array_shift;
+use function iterator_to_array;
+
 class EmitterFactoryTest extends TestCase
 {
     public function testFactoryProducesEmitterStackWithSapiEmitterComposed()

test/Container/ResponseFactoryFactoryWithoutDiactorosTest.php

@@ -15,6 +15,11 @@
 use Zend\Expressive\Container\Exception\InvalidServiceException;
 use Zend\Expressive\Container\ResponseFactoryFactory;
 
+use function class_exists;
+use function spl_autoload_functions;
+use function spl_autoload_register;
+use function spl_autoload_unregister;
+
 class ResponseFactoryFactoryWithoutDiactorosTest extends TestCase
 {
     /** @var ContainerInterface|ObjectProphecy */

test/Container/ServerRequestFactoryFactoryWithoutDiactorosTest.php

@@ -15,6 +15,11 @@
 use Zend\Expressive\Container\Exception\InvalidServiceException;
 use Zend\Expressive\Container\ServerRequestFactoryFactory;
 
+use function class_exists;
+use function spl_autoload_functions;
+use function spl_autoload_register;
+use function spl_autoload_unregister;
+
 class ServerRequestFactoryFactoryWithoutDiactorosTest extends TestCase
 {
     /** @var ContainerInterface|ObjectProphecy */

test/Container/StreamFactoryFactoryWithoutDiactorosTest.php

@@ -15,6 +15,15 @@
 use Zend\Expressive\Container\Exception\InvalidServiceException;
 use Zend\Expressive\Container\StreamFactoryFactory;
 
+use function class_exists;
+use function get_class;
+use function is_array;
+use function is_object;
+use function preg_match;
+use function spl_autoload_functions;
+use function spl_autoload_register;
+use function spl_autoload_unregister;
+
 class StreamFactoryFactoryWithoutDiactorosTest extends TestCase
 {
     private $autoloadFunctions = [];

test/Container/WhoopsErrorResponseGeneratorFactoryTest.php

@@ -17,6 +17,8 @@
 use Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory;
 use Zend\Expressive\Middleware\WhoopsErrorResponseGenerator;
 
+use function interface_exists;
+
 class WhoopsErrorResponseGeneratorFactoryTest extends TestCase
 {
     /** @var ContainerInterface|ObjectProphecy */

test/Container/WhoopsFactoryTest.php

@@ -21,6 +21,9 @@
 use Zend\Expressive\Container\WhoopsFactory;
 use ZendTest\Expressive\ContainerTrait;
 
+use function method_exists;
+use function sprintf;
+
 /**
  * @covers Zend\Expressive\Container\WhoopsFactory
  */

test/ExceptionTest.php

@@ -16,6 +16,12 @@
 use Zend\Expressive\Exception\InvalidMiddlewareException;
 use Zend\Expressive\Exception\MissingDependencyException;
 
+use function basename;
+use function glob;
+use function is_a;
+use function strrpos;
+use function substr;
+
 class ExceptionTest extends TestCase
 {
     public function exception() : Generator

test/Middleware/WhoopsErrorResponseGeneratorTest.php

@@ -22,6 +22,9 @@
 use Whoops\RunInterface;
 use Zend\Expressive\Middleware\WhoopsErrorResponseGenerator;
 
+use function interface_exists;
+use function method_exists;
+
 class WhoopsErrorResponseGeneratorTest extends TestCase
 {
     /** @var Run|RunInterface|ObjectProphecy */

test/MiddlewareFactoryTest.php

@@ -22,6 +22,9 @@
 use Zend\Stratigility\Middleware\RequestHandlerMiddleware;
 use Zend\Stratigility\MiddlewarePipe;
 
+use function array_shift;
+use function iterator_to_array;
+
 class MiddlewareFactoryTest extends TestCase
 {
     public function setUp()

test/Response/ServerRequestErrorResponseGeneratorTest.php

@@ -14,11 +14,12 @@
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
-use Throwable;
 use RuntimeException;
 use Zend\Expressive\Response\ServerRequestErrorResponseGenerator;
 use Zend\Expressive\Template\TemplateRendererInterface;
-use Zend\Stratigility\Utils;
+
+use function preg_match;
+use function strpos;
 
 class ServerRequestErrorResponseGeneratorTest extends TestCase
 {

test/Router/IntegrationTest.php

@@ -36,6 +36,9 @@
 use Zend\Stratigility\MiddlewarePipe;
 use ZendTest\Expressive\ContainerTrait;
 
+use function array_pop;
+use function sprintf;
+
 class IntegrationTest extends TestCase
 {
     use ContainerTrait;