From 006234a93b6fa7edbc598fbaa080534ebe90c063 Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 6 Feb 2018 13:25:02 +0000 Subject: [PATCH 1/4] Added constant visibility As we required PHP 7.1+ we can define visibility for constants. --- .../cookbook/setting-locale-depending-routing-parameter.md | 2 +- src/Handler/NotFoundHandler.php | 4 ++-- src/Middleware/ErrorResponseGenerator.php | 2 +- src/Middleware/ImplicitHeadMiddleware.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/book/cookbook/setting-locale-depending-routing-parameter.md b/docs/book/cookbook/setting-locale-depending-routing-parameter.md index af86e33f..441fd780 100644 --- a/docs/book/cookbook/setting-locale-depending-routing-parameter.md +++ b/docs/book/cookbook/setting-locale-depending-routing-parameter.md @@ -152,7 +152,7 @@ use Psr\Http\Message\ServerRequestInterface; class LocalizationMiddleware implements MiddlewareInterface { - const LOCALIZATION_ATTRIBUTE = 'locale'; + public const LOCALIZATION_ATTRIBUTE = 'locale'; public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface { diff --git a/src/Handler/NotFoundHandler.php b/src/Handler/NotFoundHandler.php index 72f85ca8..a98f40f7 100644 --- a/src/Handler/NotFoundHandler.php +++ b/src/Handler/NotFoundHandler.php @@ -17,8 +17,8 @@ class NotFoundHandler implements RequestHandlerInterface { - const TEMPLATE_DEFAULT = 'error::404'; - const LAYOUT_DEFAULT = 'layout::default'; + public const TEMPLATE_DEFAULT = 'error::404'; + public const LAYOUT_DEFAULT = 'layout::default'; /** * @var TemplateRendererInterface diff --git a/src/Middleware/ErrorResponseGenerator.php b/src/Middleware/ErrorResponseGenerator.php index 7dbd3745..5edd9a1d 100644 --- a/src/Middleware/ErrorResponseGenerator.php +++ b/src/Middleware/ErrorResponseGenerator.php @@ -17,7 +17,7 @@ class ErrorResponseGenerator { - const TEMPLATE_DEFAULT = 'error::error'; + public const TEMPLATE_DEFAULT = 'error::error'; /** * @var bool diff --git a/src/Middleware/ImplicitHeadMiddleware.php b/src/Middleware/ImplicitHeadMiddleware.php index 1581506b..6ac5587d 100644 --- a/src/Middleware/ImplicitHeadMiddleware.php +++ b/src/Middleware/ImplicitHeadMiddleware.php @@ -45,7 +45,7 @@ */ class ImplicitHeadMiddleware implements MiddlewareInterface { - const FORWARDED_HTTP_METHOD_ATTRIBUTE = 'forwarded_http_method'; + public const FORWARDED_HTTP_METHOD_ATTRIBUTE = 'forwarded_http_method'; /** * @var null|ResponseInterface From 489d37b8530a71fd73249d67551a3fa7bc0afe16 Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 6 Feb 2018 13:26:14 +0000 Subject: [PATCH 2/4] Removed unnecessary type casting --- src/Middleware/ErrorResponseGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Middleware/ErrorResponseGenerator.php b/src/Middleware/ErrorResponseGenerator.php index 5edd9a1d..63ba6cd9 100644 --- a/src/Middleware/ErrorResponseGenerator.php +++ b/src/Middleware/ErrorResponseGenerator.php @@ -50,7 +50,7 @@ public function __construct( TemplateRendererInterface $renderer = null, string $template = self::TEMPLATE_DEFAULT ) { - $this->debug = (bool) $isDevelopmentMode; + $this->debug = $isDevelopmentMode; $this->renderer = $renderer; $this->template = $template; } From 2c1ef20c3d5e05ded236b0c1993eeb51f91d4e3d Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 6 Feb 2018 13:31:29 +0000 Subject: [PATCH 3/4] Removed default property value Property is initialized in the constructor, so the default value was not even used. --- src/Middleware/ErrorResponseGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Middleware/ErrorResponseGenerator.php b/src/Middleware/ErrorResponseGenerator.php index 63ba6cd9..fcbe4f11 100644 --- a/src/Middleware/ErrorResponseGenerator.php +++ b/src/Middleware/ErrorResponseGenerator.php @@ -22,7 +22,7 @@ class ErrorResponseGenerator /** * @var bool */ - private $debug = false; + private $debug; /** * @var TemplateRendererInterface From 7dd3f8cb154cd426f074df965792e0b34dd53fbc Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 6 Feb 2018 13:34:07 +0000 Subject: [PATCH 4/4] Optimize imports --- src/Container/ApplicationFactory.php | 1 - src/Container/RequestHandlerRunnerFactory.php | 3 +-- src/Middleware/LazyLoadingMiddleware.php | 2 +- src/MiddlewareContainer.php | 2 -- src/MiddlewareFactory.php | 3 +-- test/ApplicationTest.php | 2 +- test/ConfigProviderTest.php | 4 ++-- test/Container/ApplicationConfigInjectionDelegatorTest.php | 1 - test/Container/EmitterFactoryTest.php | 1 - test/Container/RequestHandlerRunnerFactoryTest.php | 2 +- test/Container/ResponseFactoryTest.php | 2 -- .../ServerRequestErrorResponseGeneratorFactoryTest.php | 2 +- test/Middleware/ImplicitHeadMiddlewareTest.php | 1 - test/Middleware/LazyLoadingMiddlewareTest.php | 3 +-- test/MiddlewareContainerTest.php | 1 - test/MiddlewareFactoryTest.php | 4 ++-- 16 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/Container/ApplicationFactory.php b/src/Container/ApplicationFactory.php index fbfe7782..2ee9de48 100644 --- 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 index 86cc5195..4c576722 100644 --- 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 index d834a39f..306dadbd 100644 --- 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 index b1f09c5a..8f965e33 100644 --- 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 index d7f7d9ce..f1574aaf 100644 --- 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 index bcd32bc4..267f7251 100644 --- 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 index 45852f65..bf226aef 100644 --- 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 index 8da7bd6b..fa1f68cc 100644 --- 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 index 3434cac5..cb95b331 100644 --- 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 index 6744f03b..df0d71d3 100644 --- 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 index 2cf81cc2..228ab98d 100644 --- 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 index f320836c..822f5ca4 100644 --- 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 index aca3d9eb..1d61fe29 100644 --- 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 index 6a6ea3ed..92635106 100644 --- 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 index 87796cc2..e43ff1a7 100644 --- 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 index 2a612978..4dba5478 100644 --- 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 {