From 98741f978b372868b525229252314e31b7fae77b Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 5 Jan 2019 06:14:16 +0700
Subject: [PATCH] use exit(0); to actually fix the overlap redirect

---
 spec/Listener/ForceHttpsSpec.php | 29 ++++++++++++++++++++++++-----
 src/Listener/ForceHttps.php      |  2 ++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/spec/Listener/ForceHttpsSpec.php b/spec/Listener/ForceHttpsSpec.php
index c915485..135556d 100644
--- a/spec/Listener/ForceHttpsSpec.php
+++ b/spec/Listener/ForceHttpsSpec.php
@@ -4,6 +4,8 @@
 
 use ForceHttpsModule\Listener\ForceHttps;
 use Kahlan\Plugin\Double;
+use Kahlan\Plugin\Quit;
+use Kahlan\QuitException;
 use Zend\Console\Console;
 use Zend\EventManager\EventManagerInterface;
 use Zend\Http\PhpEnvironment\Request;
@@ -80,6 +82,8 @@
             $this->request              = Double::instance(['extends' => Request::class]);
             $this->uri                  = Double::instance(['extends' => Uri::class]);
             $this->routeMatch           = Double::instance(['extends' => RouteMatch::class, 'methods' => '__construct']);
+
+            Quit::disable();
         });
 
         context('on current scheme is https', function () {
@@ -159,7 +163,10 @@
                                  ->with('SendResponseListener')
                                  ->andReturn($this->sendResponseListener);
 
-                $listener->forceHttpsScheme($this->mvcEvent);
+                $closure = function () use ($listener) {
+                    $listener->forceHttpsScheme($this->mvcEvent);
+                };
+                expect($closure)->toThrow(new QuitException('Exit statement occurred', 0));
 
                 expect($this->mvcEvent)->toReceive('getResponse');
 
@@ -197,7 +204,10 @@
                                  ->with('SendResponseListener')
                                  ->andReturn($this->sendResponseListener);
 
-                $listener->forceHttpsScheme($this->mvcEvent);
+                $closure = function () use ($listener) {
+                    $listener->forceHttpsScheme($this->mvcEvent);
+                };
+                expect($closure)->toThrow(new QuitException('Exit statement occurred', 0));
 
                 expect($this->mvcEvent)->toReceive('getResponse');
 
@@ -233,7 +243,10 @@
                                  ->with('SendResponseListener')
                                  ->andReturn($this->sendResponseListener);
 
-                $listener->forceHttpsScheme($this->mvcEvent);
+                $closure = function () use ($listener) {
+                    $listener->forceHttpsScheme($this->mvcEvent);
+                };
+                expect($closure)->toThrow(new QuitException('Exit statement occurred', 0));
 
                 expect($this->mvcEvent)->toReceive('getResponse');
                 expect($this->response)->toReceive('getHeaders', 'addHeaderLine')->with('Location', 'https://example.com/about');
@@ -271,7 +284,10 @@
                                  ->with('SendResponseListener')
                                  ->andReturn($this->sendResponseListener);
 
-                $listener->forceHttpsScheme($this->mvcEvent);
+                $closure = function () use ($listener) {
+                    $listener->forceHttpsScheme($this->mvcEvent);
+                };
+                expect($closure)->toThrow(new QuitException('Exit statement occurred', 0));
 
                 expect($this->mvcEvent)->toReceive('getResponse');
                 expect($this->response)->toReceive('getHeaders', 'addHeaderLine')->with('Location', 'https://www.example.com/about');
@@ -314,7 +330,10 @@
                 allow($this->response)->toReceive('setStatusCode')->with(308)->andReturn($this->response);
                 allow($this->response)->toReceive('send');
 
-                $listener->forceHttpsScheme($this->mvcEvent);
+                $closure = function () use ($listener) {
+                    $listener->forceHttpsScheme($this->mvcEvent);
+                };
+                expect($closure)->toThrow(new QuitException('Exit statement occurred', 0));
 
                 expect($this->mvcEvent)->toReceive('getResponse');
 
diff --git a/src/Listener/ForceHttps.php b/src/Listener/ForceHttps.php
index bd6e303..c450739 100644
--- a/src/Listener/ForceHttps.php
+++ b/src/Listener/ForceHttps.php
@@ -99,5 +99,7 @@ public function forceHttpsScheme(MvcEvent $e) : void
         $response->getHeaders()
                  ->addHeaderLine('Location', $httpsRequestUri);
         $response->send();
+
+        exit(0);
     }
 }