Merge branch 'php7error'

samsonasik · Mar 25, 2017 · 0f48b45 · 0f48b45
2 parents 9357705 + 86ffc09
commit 0f48b45
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 64 deletions.
diff --git a/spec/Integration/IntegrationViaErrorPreviewActionMiddlewareForXmlHttpRequestSpec.php b/spec/Integration/IntegrationViaErrorPreviewActionMiddlewareForXmlHttpRequestSpec.php
@@ -81,7 +81,7 @@
             Quit::disable();
 
             $serverRequest = new ServerRequest([], [], '/error-preview', 'GET');
-            $serverRequest = $serverRequest->withHeader('X_REQUESTED_WITH', 'XMLHttpRequest');
+            $serverRequest = $serverRequest->withHeader('X-Requested-With', 'XMLHttpRequest');
 
             ob_start();
             $closure = function () use ($serverRequest) {
@@ -99,39 +99,9 @@
 }
 json
             );
-
-        });
-
-    });
-
-    describe('/error-preview/error', function() {
-
-        it('show error page', function() {
-
-            Quit::disable();
-
-            $serverRequest = new ServerRequest([], [], '/error-preview/error', 'GET');
-            $serverRequest = $serverRequest->withHeader('X_REQUESTED_WITH', 'XMLHttpRequest');
-
-            ob_start();
-            $closure = function () use ($serverRequest) {
-                $this->app->run($serverRequest);
-            };
-            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
-            $content = ob_get_clean();
-
-            expect($content)->toBe(<<<json
-{
-    "type": "http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html",
-    "title": "Internal Server Error",
-    "status": 500,
-    "detail": "We have encountered a problem and we can not fulfill your request. An error report has been generated and send to the support team and someone will attend to this problem urgently. Please try again later. Thank you for your patience."
-}
-json
-            );
-
 
         });
+
     });
 
 });
diff --git a/spec/Integration/IntegrationViaErrorPreviewActionMiddlewareSpec.php b/spec/Integration/IntegrationViaErrorPreviewActionMiddlewareSpec.php
@@ -112,6 +112,28 @@
             expect($content)->toContain('<p>We have encountered a problem and we can not fulfill your request');
 
         });
+
+    });
+
+    describe('/error-preview/php7error', function() {
+
+        it('show error page', function() {
+
+            Quit::disable();
+
+            $serverRequest = new ServerRequest([], [], '/error-preview/php7error', 'GET');
+
+            ob_start();
+            $closure = function () use ($serverRequest) {
+                $this->app->run($serverRequest);
+            };
+            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $content = ob_get_clean();
+
+            expect($content)->toContain('<p>We have encountered a problem and we can not fulfill your request');
+
+        });
+
     });
 
 });
diff --git a/spec/Middleware/ExpressiveSpec.php b/spec/Middleware/ExpressiveSpec.php
@@ -5,10 +5,9 @@
 use ErrorHeroModule\Handler\Logging;
 use ErrorHeroModule\Middleware\Expressive;
 use Kahlan\Plugin\Double;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Zend\Console\Console;
 use Zend\Diactoros\Response;
+use Zend\Diactoros\ServerRequest;
 use Zend\Expressive\Template\TemplateRendererInterface;
 use Zend\Http\PhpEnvironment\Request;
 
@@ -88,8 +87,8 @@
 
             $config['enable'] = false;
 
-            $request  = Double::instance(['implements' => ServerRequestInterface::class]);
-            $response = Double::instance(['implements' => ResponseInterface::class]);
+            $request  = new ServerRequest();
+            $response = new Response();
             $next     = function ($request, $response) {
                 return new Response();
             };
@@ -102,8 +101,8 @@
 
         it('returns next() when no error', function () {
 
-            $request  = Double::instance(['implements' => ServerRequestInterface::class]);
-            $response = Double::instance(['implements' => ResponseInterface::class]);
+            $request  = new ServerRequest();
+            $response = new Response();
             $next     = function ($request, $response) {
                 return new Response();
             };

diff --git a/spec/Middleware/Routed/Preview/ErrorPreviewActionSpec.php b/spec/Middleware/Routed/Preview/ErrorPreviewActionSpec.php
@@ -48,6 +48,24 @@
 
         });
 
+        it('PHP7 Error', function() {
+
+            skipIf(PHP_MAJOR_VERSION < 7);
+
+            try {
+                $request  = Double::instance(['implements' => ServerRequestInterface::class]);
+                allow($request)->toReceive('getAttribute')->with('action', 'exception')->andReturn('php7error');
+
+                $response = Double::instance(['implements' => ResponseInterface::class]);
+                $next     = function ($request, $response) {};
+
+                $this->middleware->__invoke($request, $response, $next);
+            } catch (\Throwable $error) {
+                expect($error)->toBeAnInstanceOf(\Throwable::class);
+            }
+
+        });
+
     });
 
 });
diff --git a/src/Handler/Logging.php b/src/Handler/Logging.php
@@ -5,8 +5,8 @@
 use Error;
 use ErrorException;
 use Exception;
+use Psr\Http\Message\ServerRequestInterface;
 use RuntimeException;
-use Zend\Diactoros\ServerRequest;
 use Zend\Http\PhpEnvironment\Request as HttpRequest;
 use Zend\Log\Logger;
 use Zend\Log\Writer\Db;
@@ -28,7 +28,7 @@ class Logging
     private $serverUrl;
 
     /**
-     * @var RequestInterface|ServerRequest
+     * @var RequestInterface|ServerRequestInterface
      */
     private $request;
 
@@ -68,14 +68,14 @@ class Logging
     private $emailSender;
 
     /**
-     * @param Logger                         $logger
-     * @param string                         $serverUrl
-     * @param string                         $requestUri
-     * @param RequestInterface|ServerRequest $request
-     * @param array                          $errorHeroModuleLocalConfig
-     * @param array                          $logWritersConfig
-     * @param Message|null                   $mailMessageService
-     * @param TransportInterface|null        $mailMessageTransport
+     * @param Logger                                  $logger
+     * @param string                                  $serverUrl
+     * @param string                                  $requestUri
+     * @param RequestInterface|ServerRequestInterface $request
+     * @param array                                   $errorHeroModuleLocalConfig
+     * @param array                                   $logWritersConfig
+     * @param Message|null                            $mailMessageService
+     * @param TransportInterface|null                 $mailMessageTransport
      */
     public function __construct(
         Logger             $logger,
@@ -102,9 +102,9 @@ public function __construct(
     /**
      * Set ServerRequest for expressive
      *
-     * @param ServerRequest $request
+     * @param ServerRequestInterface $request
      */
-    public function setServerRequestandRequestUri(ServerRequest $request)
+    public function setServerRequestandRequestUri(ServerRequestInterface $request)
     {
         $this->request = $request;
         $this->requestUri = $request->getUri()->getPath();
@@ -167,7 +167,7 @@ private function getRequestData()
             ];
         }
 
-        if ($this->request instanceof ServerRequest) {
+        if ($this->request instanceof ServerRequestInterface) {
             $query          = $this->request->getQueryParams();
             $request_method = $this->request->getMethod();
             $body_data      = ($this->request->getMethod() === 'POST')

diff --git a/src/HeroTrait.php b/src/HeroTrait.php
@@ -89,7 +89,7 @@ public function phpErrorHandler($errorType, $errorMessage, $errorFile, $errorLin
         }
 
         if (! $errorExcluded) {
-            $this->showDefaultViewWhenDisplayErrorSetttingIsDisabled($this->request);
+            $this->showDefaultViewWhenDisplayErrorSetttingIsDisabled();
         }
     }
 }
diff --git a/src/Listener/Mvc.php b/src/Listener/Mvc.php
@@ -89,11 +89,10 @@ public function exceptionError(Event $e)
     /**
      * It show default view if display_errors setting = 0.
      *
-     * @param mixed|null $request
      *
      * @return void
      */
-    private function showDefaultViewWhenDisplayErrorSetttingIsDisabled($request = null)
+    private function showDefaultViewWhenDisplayErrorSetttingIsDisabled()
     {
         $displayErrors = $this->errorHeroModuleConfig['display-settings']['display_errors'];
         if ($displayErrors) {

diff --git a/src/Middleware/Expressive.php b/src/Middleware/Expressive.php
@@ -42,24 +42,28 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         }
 
         try {
-            $response =  $next($request, $response);
-            $this->phpError($request);
+            $this->request = $request;
+            $this->logging->setServerRequestandRequestUri($request);
+
+            $this->phpError();
+
+            $response      =  $next($request, $response);
+
 
             return $response;
+        } catch (Error $e) {
+            $this->exceptionError($e, $request);
         } catch (Exception $e) {
             $this->exceptionError($e, $request);
         }
     }
 
     /**
-     * @param ServerRequestInterface $request
      *
      * @return void
      */
-    public function phpError(ServerRequestInterface $request)
+    public function phpError()
     {
-        $this->request = $request;
-
         register_shutdown_function([$this, 'execOnShutdown']);
         set_error_handler([$this, 'phpErrorHandler']);
     }
@@ -71,20 +75,19 @@ public function phpError(ServerRequestInterface $request)
      */
     public function exceptionError($e, $request)
     {
-        $this->logging->setServerRequestandRequestUri($request);
         $this->logging->handleException(
             $e
         );
 
-        $this->showDefaultViewWhenDisplayErrorSetttingIsDisabled($request);
+        $this->showDefaultViewWhenDisplayErrorSetttingIsDisabled();
     }
 
     /**
      * It show default view if display_errors setting = 0.
      *
      * @return void
      */
-    private function showDefaultViewWhenDisplayErrorSetttingIsDisabled($request)
+    private function showDefaultViewWhenDisplayErrorSetttingIsDisabled()
     {
         $displayErrors = $this->errorHeroModuleConfig['display-settings']['display_errors'];
         if ($displayErrors) {
@@ -94,7 +97,7 @@ private function showDefaultViewWhenDisplayErrorSetttingIsDisabled($request)
         $response = new Response();
         $response = $response->withStatus(500);
 
-        $isXmlHttpRequest = $request->hasHeader('X_REQUESTED_WITH');
+        $isXmlHttpRequest = $this->request->hasHeader('X-Requested-With');
 
         if ($isXmlHttpRequest === true &&
             isset($this->errorHeroModuleConfig['display-settings']['ajax']['message'])

diff --git a/src/Middleware/Routed/Preview/ErrorPreviewAction.php b/src/Middleware/Routed/Preview/ErrorPreviewAction.php
@@ -15,6 +15,10 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
             throw new \Exception('a sample error preview');
         }
 
+        if ($action === 'php7error' && class_exists(\Error::class)) {
+            throw new \Error('error of php 7');
+        }
+
         $array = [];
         $array[1]; // E_NOTICE
     }