Merge pull request #544 from webimpress/fixes

Expressive 3.0 fixes

Conflicts:
	test/ConfigProviderTest.php

Author: weierophinney

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
     {

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.

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;
 

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

src/Middleware/ErrorResponseGenerator.php

@@ -17,12 +17,12 @@
 
 class ErrorResponseGenerator
 {
-    const TEMPLATE_DEFAULT = 'error::error';
+    public const TEMPLATE_DEFAULT = 'error::error';
 
     /**
      * @var bool
      */
-    private $debug = false;
+    private $debug;
 
     /**
      * @var TemplateRendererInterface
@@ -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;
     }

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

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
 {

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;

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.

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
 {