Merge branch 'hotfix/111' into develop

Forward port #111

Author: weierophinney

src/Template/Twig.php

@@ -10,8 +10,8 @@
 namespace Zend\Expressive\Template;
 
 use LogicException;
-use Twig_Loader_Filesystem as TwigFilesystem;
 use Twig_Environment as TwigEnvironment;
+use Twig_Loader_Filesystem as TwigFilesystem;
 
 /**
  * Template implementation bridging league/plates

src/Template/ZendView.php

@@ -9,13 +9,13 @@
 
 namespace Zend\Expressive\Template;
 
+use Zend\Expressive\Exception;
 use Zend\View\Model\ModelInterface;
 use Zend\View\Model\ViewModel;
-use Zend\View\Renderer\RendererInterface;
 use Zend\View\Renderer\PhpRenderer;
+use Zend\View\Renderer\RendererInterface;
 use Zend\View\Resolver\AggregateResolver;
 use Zend\View\Resolver\ResolverInterface;
-use Zend\Expressive\Exception;
 
 /**
  * Template implementation bridging zendframework/zend-view.

test/AppFactoryTest.php

@@ -11,8 +11,8 @@
 
 use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionProperty;
-use Zend\Expressive\Application;
 use Zend\Expressive\AppFactory;
+use Zend\Expressive\Application;
 
 class AppFactoryTest extends TestCase
 {

test/Container/WhoopsPageHandlerFactoryTest.php

@@ -13,8 +13,8 @@
 use ReflectionFunction;
 use ReflectionProperty;
 use Whoops\Handler\PrettyPageHandler;
-use Zend\Expressive\Container\WhoopsPageHandlerFactory;
 use Zend\Expressive\Container\Exception\InvalidServiceException;
+use Zend\Expressive\Container\WhoopsPageHandlerFactory;
 
 class WhoopsPageHandlerFactoryTest extends TestCase
 {

test/IntegrationTest.php

@@ -12,9 +12,9 @@
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
-use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Response\EmitterInterface;
+use Zend\Diactoros\ServerRequest;
 use Zend\Expressive\Application;
 use Zend\Expressive\Router\Aura as AuraRouter;
 use Zend\Expressive\TemplatedErrorHandler;

test/RouteMiddlewareTest.php

@@ -10,8 +10,8 @@
 namespace ZendTest\Expressive;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\Response;
+use Zend\Diactoros\ServerRequest;
 use Zend\Expressive\Application;
 use Zend\Expressive\Router\RouteResult;
 use Zend\Expressive\Router\RouterInterface;

test/Router/Zf2Test.php

@@ -12,9 +12,9 @@
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
 use ReflectionProperty;
-use Zend\Expressive\Router\Zf2 as Zf2Router;
-use Zend\Expressive\Router\Route;
 use Zend\Diactoros\ServerRequest;
+use Zend\Expressive\Router\Route;
+use Zend\Expressive\Router\Zf2 as Zf2Router;
 
 class Zf2Test extends TestCase
 {

test/Template/TwigTest.php

@@ -11,8 +11,8 @@
 
 use ArrayObject;
 use PHPUnit_Framework_TestCase as TestCase;
-use Twig_Loader_Filesystem;
 use Twig_Environment;
+use Twig_Loader_Filesystem;
 use Zend\Expressive\Exception;
 use Zend\Expressive\Template\TemplatePath;
 use Zend\Expressive\Template\Twig as TwigTemplate;

test/Template/ZendViewTest.php

@@ -11,8 +11,8 @@
 
 use ArrayObject;
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\Expressive\Template\ZendView;
 use Zend\Expressive\Exception;
+use Zend\Expressive\Template\ZendView;
 use Zend\View\Model\ViewModel;
 use Zend\View\Renderer\PhpRenderer;
 use Zend\View\Resolver\TemplatePathStack;

test/TemplatedErrorHandlerTest.php

@@ -15,8 +15,8 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
-use Zend\Expressive\TemplatedErrorHandler;
 use Zend\Expressive\Template\TemplateInterface;
+use Zend\Expressive\TemplatedErrorHandler;
 
 class TemplatedErrorHandlerTest extends TestCase
 {