make Listener\ForceHttps::setHttpStrictTransportSecurity() return response to make consistent with Expressive one

Author: samsonasik

src/Listener/ForceHttps.php

@@ -45,6 +45,7 @@ public function attach(EventManagerInterface $events, $priority = 1)
      * @param string   $uriScheme
      * @param mixed    $match     didn't typed hinted in code in favor of zf-mvc ^2.5 RouteMatch compat
      * @param Response $response
+     * @return Response
      */
     private function setHttpStrictTransportSecurity($uriScheme, $match, Response $response)
     {
@@ -56,19 +57,19 @@ private function setHttpStrictTransportSecurity($uriScheme, $match, Response $re
                 $this->config['strict_transport_security']['value']
             )
         ) {
-            return;
+            return $response;
         }
 
         if ($this->config['strict_transport_security']['enable'] === true) {
             $response->getHeaders()
                      ->addHeaderLine('Strict-Transport-Security: ' . $this->config['strict_transport_security']['value']);
-            return;
+            return $response;
         }
 
         // set max-age = 0 to strictly expire it,
         $response->getHeaders()
                  ->addHeaderLine('Strict-Transport-Security: max-age=0');
-        return;
+        return $response;
     }
 
     /**
@@ -92,13 +93,11 @@ public function forceHttpsScheme(MvcEvent $e)
         $uriScheme = $uri->getScheme();
 
         $routeMatch = $e->getRouteMatch();
-        $this->setHttpStrictTransportSecurity($uriScheme, $routeMatch, $response);
+        $response   = $this->setHttpStrictTransportSecurity($uriScheme, $routeMatch, $response);
         if (! $this->validateSchemeAndToBeForcedHttpsConfig($uriScheme, $routeMatch)) {
             return;
         }
 
-        /** @var $response \Zend\Http\PhpEnvironment\Response */
-        $response        = $e->getResponse();
         $httpsRequestUri = $this->withWwwPrefixWhenRequired($uri->setScheme('https')->toString());
 
         // 307 keeps headers, request method, and request body