move is console or not enabled check to trait

samsonasik · Apr 11, 2018 · af232cf · af232cf
1 parent 404b083
commit af232cf
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 29 deletions.
diff --git a/spec/Listener/ForceHttpsSpec.php b/spec/Listener/ForceHttpsSpec.php
@@ -35,9 +35,22 @@
 
         });
 
-        it('attach on route event on non-console and enable', function () {
+        it('not attach when not enabled', function () {
+
+            Console::overrideIsConsole(false);
+            $listener = new ForceHttps([
+                'enable'                => false,
+                'force_all_routes'      => true,
+                'force_specific_routes' => [],
+            ]);
 
-            $eventManager =  Double::instance(['implements' => EventManagerInterface::class]);
+            $listener->attach($this->eventManager);
+
+            expect($this->eventManager)->not->toReceive('attach')->with(MvcEvent::EVENT_ROUTE, [$listener, 'forceHttpsScheme']);
+
+        });
+
+        it('attach on route event on non-console and enable', function () {
 
             Console::overrideIsConsole(false);
             $listener = new ForceHttps([
@@ -46,9 +59,10 @@
                 'force_specific_routes' => [],
             ]);
 
-            $listener->attach($eventManager);
+            allow($this->eventManager)->toReceive('attach')->with(MvcEvent::EVENT_ROUTE, [$listener, 'forceHttpsScheme']);
+            $listener->attach($this->eventManager);
 
-            expect($eventManager)->not->toReceive('attach')->with(MvcEvent::EVENT_ROUTE, [$listener, 'forceHttpsScheme']);
+            expect($this->eventManager)->toReceive('attach')->with(MvcEvent::EVENT_ROUTE, [$listener, 'forceHttpsScheme']);
 
         });
 
@@ -64,23 +78,6 @@
             $this->routeMatch = Double::instance(['extends' => RouteMatch::class, 'methods' => '__construct']);
         });
 
-        context('not enabled', function () {
-
-            it('returns early', function () {
-
-                $listener = new ForceHttps([
-                    'enable'                => false,
-                    'force_all_routes'      => true,
-                    'force_specific_routes' => [],
-                ]);
-                $actual = $listener->forceHttpsScheme($this->mvcEvent);
-
-                expect($actual)->toBe(null);
-
-            });
-
-        });
-
         context('on current scheme is https', function () {
 
             it('not redirect if uri already has https scheme and without strict_transport_security', function () {

diff --git a/src/HttpsTrait.php b/src/HttpsTrait.php
@@ -5,12 +5,18 @@
 namespace ForceHttpsModule;
 
 use Psr\Http\Message\ResponseInterface;
+use Zend\Console\Console;
 use Zend\Expressive\Router\RouteResult;
 use Zend\Http\PhpEnvironment\Response;
 use Zend\Router\RouteMatch;
 
 trait HttpsTrait
 {
+    private function isConsoleOrNotEnabled() : bool
+    {
+        return Console::isConsole() || ! $this->config['enable'];
+    }
+
     private function isSchemeHttps(string $uriScheme) : bool
     {
         return $uriScheme === 'https';

diff --git a/src/Listener/ForceHttps.php b/src/Listener/ForceHttps.php
@@ -5,7 +5,6 @@
 namespace ForceHttpsModule\Listener;
 
 use ForceHttpsModule\HttpsTrait;
-use Zend\Console\Console;
 use Zend\EventManager\AbstractListenerAggregate;
 use Zend\EventManager\EventManagerInterface;
 use Zend\Http\PhpEnvironment\Response;
@@ -28,7 +27,7 @@ public function __construct(array $config)
 
     public function attach(EventManagerInterface $events, $priority = 1) : void
     {
-        if (Console::isConsole()) {
+        if ($this->isConsoleOrNotEnabled()) {
             return;
         }
 
@@ -58,10 +57,6 @@ private function setHttpStrictTransportSecurity(string $uriScheme, RouteMatch $m
      */
     public function forceHttpsScheme(MvcEvent $e) : void
     {
-        if (! $this->config['enable']) {
-           return;
-        }
-
         /** @var \Zend\Http\PhpEnvironment\Request $request */
         $request   = $e->getRequest();
         /** @var \Zend\Http\PhpEnvironment\Response $response */

diff --git a/src/Middleware/ForceHttps.php b/src/Middleware/ForceHttps.php
@@ -9,7 +9,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Console\Console;
 use Zend\Expressive\Router\RouteResult;
 use Zend\Expressive\Router\RouterInterface;
 
@@ -45,7 +44,7 @@ private function setHttpStrictTransportSecurity($uriScheme, RouteResult $match,
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
     {
         $response = $handler->handle($request);
-        if (Console::isConsole() || ! $this->config['enable']) {
+        if ($this->isConsoleOrNotEnabled()) {
             return $response;
         }