Merge branch 'develop'

Author: gabidj

CHANGELOG.md

@@ -1,28 +1,11 @@
-## 1.0.1 - 2018-05-14
-
-### Changed
-* Updated `dot-flashmessenger plugin` dependency
-
-### Added
-* Nothing
-
-### Deprecated
-* Nothing
-
-### Removed
-* Nothing
-
-### Fixed
-* Nothing
-
-
-## 1.0.0 - 2018-04-12
+## 1.0.0 - 2018-05-15
 
 ### Changed
 * Middleware support
 * Update `zendframework/zend-expressive` to ^3.0
 * Update `zendframework/zend-expressive-template` to ^2.0
 * Update `dotkernel/dot-helpers` to ^1.0
+* Updated `dot-flashmessenger plugin` dependency
 
 ### Added
 * PSR-15 Middleware support
@@ -31,7 +14,7 @@
 * Nothing
 
 ### Removed
-* HTTP Interop middleware support
+* HTTP InterOp middleware support
 
 ### Fixed
 * Nothing

src/Action/LoginAction.php

@@ -21,10 +21,10 @@
 use Dot\Authentication\Web\Utils;
 use Dot\FlashMessenger\FlashMessengerInterface;
 use Dot\Helpers\Route\RouteHelper;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response\HtmlResponse;
 use Zend\Diactoros\Response\RedirectResponse;
 use Zend\Diactoros\Uri;
@@ -84,10 +84,10 @@ public function __construct(
 
     /**
      * @param ServerRequestInterface $request
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $handler
      * @return ResponseInterface
      */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         if ($this->authentication->hasIdentity()) {
             return new RedirectResponse($this->routeHelper->generateUri($this->options->getAfterLoginRoute()));

src/Action/LogoutAction.php

@@ -16,10 +16,10 @@
 use Dot\Authentication\Web\Event\DispatchAuthenticationEventTrait;
 use Dot\Authentication\Web\Options\WebAuthenticationOptions;
 use Dot\Helpers\Route\RouteHelper;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response\RedirectResponse;
 
 /**
@@ -58,10 +58,10 @@ public function __construct(
 
     /**
      * @param ServerRequestInterface $request
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $handler
      * @return ResponseInterface
      */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         if (!$this->authentication->hasIdentity()) {
             return new RedirectResponse($this->routeHelper->generateUri($this->options->getAfterLogoutRoute()));

src/ErrorHandler/UnauthorizedHandler.php

@@ -20,10 +20,10 @@
 use Dot\Authentication\Web\Options\WebAuthenticationOptions;
 use Dot\FlashMessenger\FlashMessengerInterface;
 use Dot\Helpers\Route\RouteHelper;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response\RedirectResponse;
 use Zend\Diactoros\Uri;
 
@@ -75,15 +75,15 @@ public function __construct(
 
     /**
      * @param ServerRequestInterface $request
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $handler
      * @return ResponseInterface
      * @throws \Exception
      * @throws \Throwable
      */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         try {
-            $response = $delegate->process($request);
+            $response = $handler->handle($request);
             return $response;
         } catch (UnauthorizedException $e) {
             return $this->handleUnauthorizedError($e, $request);