Fixes display_errors = 1 usage

Author: samsonasik

spec/Integration/IntegrationViaErrorPreviewControllerForErrorShownSpec.php

@@ -53,7 +53,7 @@
 
                 expect($content)->toBe('');
             } catch (\Throwable $t) {
-
+                expect($t)->toBeAnInstanceOf(\Exception::class);
             }
         });
     });

spec/Listener/MvcSpec.php

@@ -283,6 +283,8 @@
 
         it('call error_get_last() and return error', function () {
 
+            Quit::disable();
+
             allow('error_get_last')->toBeCalled()->andReturn([
                 'type' => 8,
                 'message' => 'Undefined variable: a',
@@ -348,6 +350,15 @@
 
             ];
 
+            $resolver = new Resolver\AggregateResolver();
+
+            $map = new Resolver\TemplateMapResolver([
+                'layout/layout'                   => __DIR__ . '/../Fixture/view/layout/layout.phtml',
+                'error-hero-module/error-default' => __DIR__ . '/../Fixture/view/error-hero-module/error-default.phtml',
+            ]);
+            $resolver->attach($map);
+            $this->renderer->setResolver($resolver);
+
             $logging = new Logging(
                 $logger,
                 'http://serverUrl',
@@ -395,11 +406,31 @@
                 $logging,
                 $this->renderer
             );
-            $listener->execOnShutdown();
+
+            ob_start();
+            $closure = function () use ($listener) {
+                $listener->execOnShutdown();
+            };
+            expect($closure)->toThrow(new QuitException('Exit statement occurred', -1));
+            $content = ob_get_clean();
+
+            expect($content)->toContain('We have encountered a problem');
 
         });
 
 
     });
 
+    describe('->phpErrorHandler()', function () {
+
+        it('exclude error type and match', function () {
+
+            $this->listener->phpErrorHandler(E_USER_DEPRECATED, 'deprecated', 'file.php', 1);
+            expect(error_reporting())->toBe(E_ALL | E_STRICT);
+            expect(ini_get('display_errors'))->toBe("0");
+
+        });
+
+    });
+
 });

spec/Middleware/ExpressiveSpec.php

@@ -114,4 +114,16 @@
 
     });
 
+    describe('->phpErrorHandler()', function () {
+
+        it('exclude error type and match', function () {
+
+            $this->middleware->phpErrorHandler(E_USER_DEPRECATED, 'deprecated', 'file.php', 1);
+            expect(error_reporting())->toBe(E_ALL | E_STRICT);
+            expect(ini_get('display_errors'))->toBe("0");
+
+        });
+
+    });
+
 });

src/Controller/ErrorPreviewController.php

@@ -15,7 +15,5 @@ public function errorAction()
     {
         $array = [];
         $array[1]; // E_NOTICE
-
-        return $this->getResponse();
     }
 }

src/Listener/Mvc.php

@@ -63,6 +63,10 @@ public function attach(EventManagerInterface $events, $priority = 1)
      */
     public function phpError(Event $e)
     {
+        if ($this->errorHeroModuleConfig['display-settings']['display_errors']) {
+            return;
+        }
+
         register_shutdown_function([$this, 'execOnShutdown']);
         set_error_handler([$this, 'phpErrorHandler']);
     }
@@ -83,6 +87,11 @@ public function exceptionError(Event $e)
             $exception
         );
 
+        $displayErrors = $this->errorHeroModuleConfig['display-settings']['display_errors'];
+        if ($displayErrors) {
+            return;
+        }
+
         $this->showDefaultViewWhenDisplayErrorSetttingIsDisabled();
     }
 
@@ -94,11 +103,6 @@ public function exceptionError(Event $e)
      */
     private function showDefaultViewWhenDisplayErrorSetttingIsDisabled()
     {
-        $displayErrors = $this->errorHeroModuleConfig['display-settings']['display_errors'];
-        if ($displayErrors) {
-            return;
-        }
-
         if (!Console::isConsole()) {
 
             $response = new HttpResponse();

src/Middleware/Expressive.php

@@ -54,9 +54,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
 
             $this->phpError();
 
-            $response      =  $next($request, $response);
-
-            return $response;
+            return $next($request, $response);
         } catch (Error $e) {
             $this->exceptionError($e, $request);
         } catch (Exception $e) {
@@ -70,6 +68,10 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
      */
     public function phpError()
     {
+        if ($this->errorHeroModuleConfig['display-settings']['display_errors']) {
+            return;
+        }
+
         register_shutdown_function([$this, 'execOnShutdown']);
         set_error_handler([$this, 'phpErrorHandler']);
     }
@@ -101,11 +103,6 @@ public function exceptionError($e, $request)
      */
     private function showDefaultViewWhenDisplayErrorSetttingIsDisabled()
     {
-        $displayErrors = $this->errorHeroModuleConfig['display-settings']['display_errors'];
-        if ($displayErrors) {
-            return;
-        }
-
         $response = new Response();
         $response = $response->withStatus(500);
 

src/Middleware/Routed/Preview/ErrorPreviewAction.php

@@ -21,7 +21,5 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
 
         $array = [];
         $array[1]; // E_NOTICE
-
-        return $response;
     }
 }