__invoke signature fix of $next and various type hint added

Author: samsonasik

spec/Middleware/ForceHttpsSpec.php

@@ -5,8 +5,9 @@
 use ForceHttpsModule\Middleware\ForceHttps;
 use Kahlan\Plugin\Double;
 use Zend\Console\Console;
+use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response;
 use Zend\Diactoros\Uri;
 use Zend\Expressive\Router\RouterInterface;
 use Zend\Expressive\Router\RouteResult;
@@ -16,19 +17,19 @@
     describe('->invoke()', function () {
 
         given('response', function () {
-            return Double::instance(['extends'    => Response::class]);
+            return Double::instance(['implements' => ResponseInterface::class]);
         });
 
         given('request', function () {
-            return Double::instance(['implements'    => ServerRequestInterface::class]);
+            return Double::instance(['implements' => ServerRequestInterface::class]);
         });
 
         given('uri', function () {
-            return Double::instance(['extends'    => Uri::class]);
+            return Double::instance(['implements' => UriInterface::class]);
         });
 
         given('router', function () {
-            return Double::instance(['implements'    => RouterInterface::class]);
+            return Double::instance(['implements'  => RouterInterface::class]);
         });
 
         it('not redirect on console', function () {

src/Middleware/ForceHttps.php

@@ -3,6 +3,8 @@
 namespace ForceHttpsModule\Middleware;
 
 use ForceHttpsModule\HttpsTrait;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Zend\Console\Console;
 use Zend\Expressive\Router\RouterInterface;
 use Zend\Expressive\Router\RouteResult;
@@ -30,12 +32,11 @@ public function __construct(array $config, RouterInterface $router)
     /**
      * Set The HTTP Strict Transport Security.
      *
-     * @param string      $uriScheme
-     * @param RouteResult $match
-     *
-     * @param $response
+     * @param string            $uriScheme
+     * @param RouteResult       $match
+     * @param ResponseInterface $response
      */
-    private function setHttpStrictTransportSecurity($uriScheme, RouteResult $match, $response)
+    private function setHttpStrictTransportSecurity($uriScheme, RouteResult $match, ResponseInterface $response)
     {
         if (
             $this->isSchemeHttps($uriScheme) &&
@@ -57,7 +58,7 @@ private function setHttpStrictTransportSecurity($uriScheme, RouteResult $match,
         return $response;
     }
 
-    public function __invoke($request, $response, callable $next = null)
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next)
     {
         $match = $this->router->match($request);
         if (Console::isConsole() || ! $this->config['enable'] || $match->isFailure()) {