Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Template/Twig.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Template/ZendView.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test/AppFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion test/Container/WhoopsPageHandlerFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion test/IntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/RouteMiddlewareTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions test/Router/Zf2Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion test/Template/TwigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/Template/ZendViewTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/TemplatedErrorHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion test/WhoopsErrorHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
use Exception;
use PHPUnit_Framework_TestCase as TestCase;
use Prophecy\Argument;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\StreamInterface;
use Whoops\Handler\PrettyPageHandler;
use Whoops\Run as Whoops;
Expand Down