Merge pull request #40 from samsonasik/refactor-listener

refactor mvc listener to use stopPropagation(true) when possible
samsonasik · May 14, 2018 · 95f5cc0 · 95f5cc0
2 parents ad8f376 + 17102f6
commit 95f5cc0
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 98 deletions.
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForCannotConnecttoDBSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForCannotConnecttoDBSpec.php
@@ -4,8 +4,6 @@
 
 use ErrorHeroModule;
 use ErrorHeroModule\Controller\ErrorPreviewController;
-use Kahlan\Plugin\Quit;
-use Kahlan\QuitException;
 use Zend\Console\Console;
 use Zend\Mvc\Application;
 
@@ -42,17 +40,12 @@
 
         it('show error page', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');
@@ -66,17 +59,12 @@
 
         it('show error page', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview/error');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');

diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForIdempotentSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForIdempotentSpec.php
@@ -4,8 +4,6 @@
 
 use ErrorHeroModule;
 use ErrorHeroModule\Controller\ErrorPreviewController;
-use Kahlan\Plugin\Quit;
-use Kahlan\QuitException;
 use Zend\Console\Console;
 use Zend\Mvc\Application;
 
@@ -42,17 +40,12 @@
 
         it('show error page', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');
@@ -62,17 +55,12 @@
 
         it('show error page, idempotent for error exist check in DB', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');
@@ -86,17 +74,12 @@
 
         it('show error page', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview/error');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');
@@ -106,17 +89,12 @@
 
         it('show error page, idempotent for error exist check in DB', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview/error');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');

diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForXmlHttpRequestSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForXmlHttpRequestSpec.php
@@ -4,8 +4,6 @@
 
 use ErrorHeroModule;
 use ErrorHeroModule\Controller\ErrorPreviewController;
-use Kahlan\Plugin\Quit;
-use Kahlan\QuitException;
 use Zend\Console\Console;
 use Zend\Http\PhpEnvironment\Request;
 use Zend\Http\PhpEnvironment\Response;
@@ -44,8 +42,6 @@
 
         it('show error page', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview');
@@ -54,10 +50,7 @@
             allow(Response::class)->toReceive('getHeaders', 'addHeaderLine');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toBe(<<<json

diff --git a/...tegration/IntegrationViaErrorPreviewControllerForXmlHttpRequestWithNonJsonMessageSpec.php b/...tegration/IntegrationViaErrorPreviewControllerForXmlHttpRequestWithNonJsonMessageSpec.php
@@ -4,8 +4,6 @@
 
 use ErrorHeroModule;
 use ErrorHeroModule\Controller\ErrorPreviewController;
-use Kahlan\Plugin\Quit;
-use Kahlan\QuitException;
 use Zend\Console\Console;
 use Zend\Http\PhpEnvironment\Request;
 use Zend\Http\PhpEnvironment\Response;
@@ -44,8 +42,6 @@
 
         it('show error page', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview');
@@ -54,10 +50,7 @@
             allow(Response::class)->toReceive('getHeaders', 'addHeaderLine');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toBe('We have encountered a problem and we can not fulfill your request. An error report has been generated and sent to the support team and someone will attend to this problem urgently. Please try again later. Thank you for your patience.');

diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerSpec.php
@@ -4,8 +4,6 @@
 
 use ErrorHeroModule;
 use ErrorHeroModule\Controller\ErrorPreviewController;
-use Kahlan\Plugin\Quit;
-use Kahlan\QuitException;
 use Zend\Console\Console;
 use Zend\Db\Adapter\Adapter;
 use Zend\Db\ResultSet\ResultSet;
@@ -49,17 +47,12 @@
 
         it('show error page', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');
@@ -73,17 +66,12 @@
 
         it('show error page', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview/error');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');

diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerWithEnableSendMailSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerWithEnableSendMailSpec.php
@@ -5,7 +5,6 @@
 use ErrorHeroModule;
 use ErrorHeroModule\Controller\ErrorPreviewController;
 use Kahlan\Plugin\Quit;
-use Kahlan\QuitException;
 use Zend\Console\Console;
 use Zend\Db\Adapter\Adapter;
 use Zend\Db\ResultSet\ResultSet;
@@ -56,10 +55,7 @@
             $request->setUri('/error-preview');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');
@@ -80,10 +76,7 @@
             $request->setUri('/error-preview/error');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');

diff --git a/...egration/IntegrationViaErrorPreviewControllerWithEnableSendMailWithEmptyReceiversSpec.php b/...egration/IntegrationViaErrorPreviewControllerWithEnableSendMailWithEmptyReceiversSpec.php
@@ -5,7 +5,6 @@
 use ErrorHeroModule;
 use ErrorHeroModule\Controller\ErrorPreviewController;
 use Kahlan\Plugin\Quit;
-use Kahlan\QuitException;
 use Zend\Console\Console;
 use Zend\Db\Adapter\Adapter;
 use Zend\Db\ResultSet\ResultSet;
@@ -49,17 +48,12 @@
 
         it('show error page for exception', function() {
 
-            Quit::disable();
-
             $request     = $this->application->getRequest();
             $request->setMethod('GET');
             $request->setUri('/error-preview');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');
@@ -80,10 +74,7 @@
             $request->setUri('/error-preview/error');
 
             ob_start();
-            $closure = function () {
-                $this->application->run();
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $this->application->run();
             $content = ob_get_clean();
 
             expect($content)->toContain('<title>Error');

diff --git a/src/Listener/Mvc.php b/src/Listener/Mvc.php
@@ -77,13 +77,13 @@ public function exceptionError(Event $e) : void
             return;
         }
 
-        $this->showDefaultViewWhenDisplayErrorSetttingIsDisabled();
+        $this->showDefaultViewWhenDisplayErrorSetttingIsDisabled($e);
     }
 
     /**
      * It show default view if display_errors setting = 0.
      */
-    private function showDefaultViewWhenDisplayErrorSetttingIsDisabled() : void
+    private function showDefaultViewWhenDisplayErrorSetttingIsDisabled(Event $e) : void
     {
         if (! Console::isConsole()) {
             $response = new HttpResponse();
@@ -98,10 +98,11 @@ private function showDefaultViewWhenDisplayErrorSetttingIsDisabled() : void
                 $contentType = $this->detectAjaxMessageContentType($message);
 
                 $response->getHeaders()->addHeaderLine('Content-type', $contentType);
-                $response->setContent($message);
+                $response->sendHeaders();
+                echo $message;
 
-                $response->send();
-                exit(-1);
+                $e->stopPropagation(true);
+                return;
             }
 
             Assertion::isInstanceOf($this->renderer, PhpRenderer::class);
@@ -114,10 +115,11 @@ private function showDefaultViewWhenDisplayErrorSetttingIsDisabled() : void
             $layout->setVariable('content', $this->renderer->render($view));
 
             $response->getHeaders()->addHeaderLine('Content-type', 'text/html');
-            $response->setContent($this->renderer->render($layout));
+            $response->sendHeaders();
+            echo $this->renderer->render($layout);
 
-            $response->send();
-            exit(-1);
+            $e->stopPropagation(true);
+            return;
         }
 
         $response = new ConsoleResponse();