Optimize imports

michalbundyra · michalbundyra · commit 7dd3f8cb154c · 2018-02-06T13:34:07.000Z
diff --git a/src/Container/ApplicationFactory.php b/src/Container/ApplicationFactory.php
@@ -15,7 +15,6 @@
 use Zend\Expressive\MiddlewareFactory;
 use Zend\Expressive\Router\PathBasedRoutingMiddleware;
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
-use Zend\Stratigility\MiddlewarePipe;
 
 /**
  * Create an Application instance.
diff --git a/src/Container/RequestHandlerRunnerFactory.php b/src/Container/RequestHandlerRunnerFactory.php
@@ -10,10 +10,9 @@
 namespace Zend\Expressive\Container;
 
 use Psr\Container\ContainerInterface;
-use Zend\Expressive\Application;
 use Zend\Expressive\ApplicationPipeline;
-use Zend\Expressive\ServerRequestFactory;
 use Zend\Expressive\ServerRequestErrorResponseGenerator;
+use Zend\Expressive\ServerRequestFactory;
 use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
 
diff --git a/src/Middleware/LazyLoadingMiddleware.php b/src/Middleware/LazyLoadingMiddleware.php
@@ -13,8 +13,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Expressive\MiddlewareContainer;
 use Zend\Expressive\Exception\InvalidMiddlewareException;
+use Zend\Expressive\MiddlewareContainer;
 
 class LazyLoadingMiddleware implements MiddlewareInterface
 {
diff --git a/src/MiddlewareContainer.php b/src/MiddlewareContainer.php
@@ -10,8 +10,6 @@
 namespace Zend\Expressive;
 
 use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Stratigility\Middleware\RequestHandlerMiddleware;
diff --git a/src/MiddlewareFactory.php b/src/MiddlewareFactory.php
@@ -9,12 +9,11 @@
 
 namespace Zend\Expressive;
 
-use Psr\Container\ContainerInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Stratigility\MiddlewarePipe;
 use Zend\Stratigility\Middleware\CallableMiddlewareDecorator;
 use Zend\Stratigility\Middleware\RequestHandlerMiddleware;
+use Zend\Stratigility\MiddlewarePipe;
 
 /**
  * Marshal middleware for use in the application.
diff --git a/test/ApplicationTest.php b/test/ApplicationTest.php
@@ -21,9 +21,9 @@
 use Zend\Expressive\Router\PathBasedRoutingMiddleware as RouteMiddleware;
 use Zend\Expressive\Router\Route;
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
+use Zend\Stratigility\Middleware\PathMiddlewareDecorator;
 use Zend\Stratigility\MiddlewarePipe;
 use Zend\Stratigility\MiddlewarePipeInterface;
-use Zend\Stratigility\Middleware\PathMiddlewareDecorator;
 
 class ApplicationTest extends TestCase
 {
diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
@@ -16,16 +16,16 @@
 use Zend\Expressive\ApplicationPipeline;
 use Zend\Expressive\ConfigProvider;
 use Zend\Expressive\Handler;
+use Zend\Expressive\Middleware;
 use Zend\Expressive\MiddlewareContainer;
 use Zend\Expressive\MiddlewareFactory;
-use Zend\Expressive\Middleware;
 use Zend\Expressive\Router\DispatchMiddleware;
 use Zend\Expressive\Router\PathBasedRoutingMiddleware;
 use Zend\Expressive\ServerRequestErrorResponseGenerator;
 use Zend\Expressive\ServerRequestFactory;
+use Zend\HttpHandlerRunner\RequestHandlerRunner;
 use Zend\Stratigility\Middleware\ErrorHandler;
 use Zend\Stratigility\Middleware\ErrorResponseGenerator;
-use Zend\HttpHandlerRunner\RequestHandlerRunner;
 
 class ConfigProviderTest extends TestCase
 {
diff --git a/test/Container/ApplicationConfigInjectionDelegatorTest.php b/test/Container/ApplicationConfigInjectionDelegatorTest.php
@@ -15,7 +15,6 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use ReflectionProperty;
-use SplQueue;
 use Zend\Diactoros\Response;
 use Zend\Expressive\Application;
 use Zend\Expressive\Container\ApplicationConfigInjectionDelegator;
diff --git a/test/Container/EmitterFactoryTest.php b/test/Container/EmitterFactoryTest.php
@@ -11,7 +11,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
-use Zend\Expressive\Container\EmitterFactory;
 use Zend\HttpHandlerRunner\Emitter\EmitterStack;
 use Zend\HttpHandlerRunner\Emitter\SapiEmitter;
 
diff --git a/test/Container/RequestHandlerRunnerFactoryTest.php b/test/Container/RequestHandlerRunnerFactoryTest.php
@@ -14,8 +14,8 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Expressive\ApplicationPipeline;
 use Zend\Expressive\Container\RequestHandlerRunnerFactory;
-use Zend\Expressive\ServerRequestFactory;
 use Zend\Expressive\ServerRequestErrorResponseGenerator;
+use Zend\Expressive\ServerRequestFactory;
 use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
 
diff --git a/test/Container/ResponseFactoryTest.php b/test/Container/ResponseFactoryTest.php
@@ -11,9 +11,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
-use Throwable;
 use Zend\Diactoros\Response;
-use Zend\Expressive\Container\Exception\InvalidServiceException;
 use Zend\Expressive\Container\ResponseFactory;
 
 class ResponseFactoryTest extends TestCase
diff --git a/test/Container/ServerRequestErrorResponseGeneratorFactoryTest.php b/test/Container/ServerRequestErrorResponseGeneratorFactoryTest.php
@@ -10,9 +10,9 @@
 namespace ZendTest\Expressive\Container;
 
 use Exception;
-use Psr\Container\ContainerInterface;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 use Throwable;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
diff --git a/test/Middleware/ImplicitHeadMiddlewareTest.php b/test/Middleware/ImplicitHeadMiddlewareTest.php
@@ -15,7 +15,6 @@
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\StreamInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
diff --git a/test/Middleware/LazyLoadingMiddlewareTest.php b/test/Middleware/LazyLoadingMiddlewareTest.php
@@ -11,14 +11,13 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
-use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Expressive\Exception\InvalidMiddlewareException;
-use Zend\Expressive\MiddlewareContainer;
 use Zend\Expressive\Middleware\LazyLoadingMiddleware;
+use Zend\Expressive\MiddlewareContainer;
 
 class LazyLoadingMiddlewareTest extends TestCase
 {
diff --git a/test/MiddlewareContainerTest.php b/test/MiddlewareContainerTest.php
@@ -10,7 +10,6 @@
 namespace ZendTest\Expressive;
 
 use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
diff --git a/test/MiddlewareFactoryTest.php b/test/MiddlewareFactoryTest.php
@@ -14,13 +14,13 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use ReflectionProperty;
 use Zend\Expressive\Exception;
+use Zend\Expressive\Middleware\LazyLoadingMiddleware;
 use Zend\Expressive\MiddlewareContainer;
 use Zend\Expressive\MiddlewareFactory;
-use Zend\Expressive\Middleware\LazyLoadingMiddleware;
 use Zend\Expressive\Router\DispatchMiddleware;
-use Zend\Stratigility\MiddlewarePipe;
 use Zend\Stratigility\Middleware\CallableMiddlewareDecorator;
 use Zend\Stratigility\Middleware\RequestHandlerMiddleware;
+use Zend\Stratigility\MiddlewarePipe;
 
 class MiddlewareFactoryTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`use Psr\Http\Message\ServerRequestInterface;`
`14`	`14`	`use Psr\Http\Server\MiddlewareInterface;`
`15`	`15`	`use Psr\Http\Server\RequestHandlerInterface;`
`16`		`-use Zend\Expressive\MiddlewareContainer;`
`17`	`16`	`use Zend\Expressive\Exception\InvalidMiddlewareException;`
	`17`	`+use Zend\Expressive\MiddlewareContainer;`
`18`	`18`
`19`	`19`	`class LazyLoadingMiddleware implements MiddlewareInterface`
`20`	`20`	`{`