move repetitive code for check if set strict transport security need to be skipped to trait

Author: samsonasik

src/HttpsTrait.php

@@ -2,8 +2,10 @@
 
 namespace ForceHttpsModule;
 
+use Psr\Http\Message\ResponseInterface;
 use Zend\Router\RouteMatch;
 use Zend\Expressive\Router\RouteResult;
+use Zend\Http\PhpEnvironment\Response;
 
 trait HttpsTrait
 {
@@ -40,6 +42,25 @@ private function isGoingToBeForcedToHttps($match)
         return true;
     }
 
+    /**
+     * Check if Setup Strict-Transport-Security need to be skipped.
+     *
+     * @param string                     $uriScheme
+     * @param RouteMatch|RouteResult     $match
+     * @param Response|ResponseInterface $response
+     *
+     * @return bool
+     */
+    private function isSkippedHttpStrictTransportSecurity($uriScheme, $match, $response)
+    {
+        return ! $this->isSchemeHttps($uriScheme) ||
+            ! $this->isGoingToBeForcedToHttps($match) ||
+            ! isset(
+                $this->config['strict_transport_security']['enable'],
+                $this->config['strict_transport_security']['value']
+            );
+    }
+
     /**
      * Validate Scheme and Forced Https Config
      *

src/Listener/ForceHttps.php

@@ -49,14 +49,7 @@ public function attach(EventManagerInterface $events, $priority = 1)
      */
     private function setHttpStrictTransportSecurity($uriScheme, $match, Response $response)
     {
-        if (
-            ! $this->isSchemeHttps($uriScheme) ||
-            ! $this->isGoingToBeForcedToHttps($match) ||
-            ! isset(
-                $this->config['strict_transport_security']['enable'],
-                $this->config['strict_transport_security']['value']
-            )
-        ) {
+        if ($this->isSkippedHttpStrictTransportSecurity($uriScheme, $match, $response)) {
             return $response;
         }
 

src/Middleware/ForceHttps.php

@@ -38,14 +38,7 @@ public function __construct(array $config, RouterInterface $router)
      */
     private function setHttpStrictTransportSecurity($uriScheme, RouteResult $match, ResponseInterface $response)
     {
-        if (
-            ! $this->isSchemeHttps($uriScheme) ||
-            ! $this->isGoingToBeForcedToHttps($match) ||
-            ! isset(
-                $this->config['strict_transport_security']['enable'],
-                $this->config['strict_transport_security']['value']
-            )
-        ) {
+        if ($this->isSkippedHttpStrictTransportSecurity($uriScheme, $match, $response)) {
             return $response;
         }