Merge branch 'skip-default-view-on-excluded-errors'

Author: samsonasik

spec/Fixture/autoload-for-enable-display-errors/error-hero-module.local.php

@@ -58,7 +58,8 @@
 
             // excluded php errors
             'exclude-php-errors' => [
-                E_USER_DEPRECATED
+                E_USER_DEPRECATED,
+                E_NOTICE,
             ],
 
             // show or not error

spec/Listener/MvcSpec.php

@@ -270,90 +270,6 @@
 
     });
 
-    describe('->phpError()', function () {
-
-        it('set error_reporting & ini_set(display_errors) when display_errors config = 0', function () {
-
-                expect('error_reporting')->toBeCalled();
-                expect('ini_set')->toBeCalled();
-
-                $mvcEvent = Double::instance(['extends' => MvcEvent::class, 'methods' => '__construct']);
-                $this->listener->phpError($mvcEvent);
-
-        });
-
-        it('not set error_reporting & ini_set(display_errors) when display_errors config = 0', function () {
-
-                $config = [
-                    'enable' => true,
-                    'display-settings' => [
-
-                        // excluded php errors
-                        'exclude-php-errors' => [
-                            E_USER_DEPRECATED
-                        ],
-
-                        // show or not error
-                        'display_errors'  => 1,
-
-                        // if enable and display_errors = 0, the page will bring layout and view
-                        'template' => [
-                            'layout' => 'layout/layout',
-                            'view'   => 'error-hero-module/error-default'
-                        ],
-
-                        // if enable and display_errors = 0, the console will bring message
-                        'console' => [
-                            'message' => '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.',
-                        ],
-
-                    ],
-                    'logging-settings' => [
-                        'same-error-log-time-range' => 86400,
-                    ],
-                    'email-notification-settings' => [
-                        // set to true to activate email notification on log error
-                        'enable' => false,
-
-                        // Zend\Mail\Message instance registered at service manager
-                        'mail-message'   => 'YourMailMessageService',
-
-                        // Zend\Mail\Transport\TransportInterface instance registered at service manager
-                        'mail-transport' => 'YourMailTransportService',
-
-                        // email sender
-                        'email-from'    => 'Sender Name <sender@host.com>',
-
-                        'email-to-send' => [
-                            'developer1@foo.com',
-                            'developer2@foo.com',
-                        ],
-                    ],
-                ];
-
-                $logging = Double::instance([
-                    'extends' => Logging::class,
-                    'methods' => '__construct'
-                ]);
-
-                $renderer = Double::instance(['extends' => PhpRenderer::class, 'methods' => '__construct']);
-
-                $listener =  new Mvc(
-                    $config,
-                    $logging,
-                    $renderer
-                );
-
-                expect('error_reporting')->not->toBeCalled();
-                expect('ini_set')->not->toBeCalled();
-
-                $mvcEvent = Double::instance(['extends' => MvcEvent::class, 'methods' => '__construct']);
-                $listener->phpError($mvcEvent);
-
-        });
-
-    });
-
     describe('->execOnShutdown()', function ()  {
 
         it('call error_get_last() and return nothing', function () {

src/Listener/Mvc.php

@@ -93,11 +93,6 @@ public function exceptionError($e)
 
     public function phpError($e)
     {
-        if ($this->errorHeroModuleConfig['display-settings']['display_errors'] === 0) {
-            error_reporting(E_ALL | E_STRICT);
-            ini_set('display_errors', 0);
-        }
-
         register_shutdown_function([$this, 'execOnShutdown']);
         set_error_handler([$this, 'phpErrorHandler']);
     }
@@ -119,23 +114,29 @@ public function execOnShutdown()
     public function phpErrorHandler($errorType, $errorMessage, $errorFile, $errorLine)
     {
         $errorTypeString = $this->errorType[$errorType];
+        $errorExcluded = false;
+        if ($errorLine) {
+            if (in_array($errorType, $this->errorHeroModuleConfig['display-settings']['exclude-php-errors'])) {
+                $errorExcluded = true;
+            } else {
+                $this->logging->handleError(
+                    $errorType,
+                    $errorMessage,
+                    $errorFile,
+                    $errorLine,
+                    $errorTypeString
+                );
+            }
+        }
 
-        if ($errorLine &&
-            !in_array(
-                $errorType,
-                $this->errorHeroModuleConfig['display-settings']['exclude-php-errors']
-            )
-        ) {
-            $this->logging->handleError(
-                $errorType,
-                $errorMessage,
-                $errorFile,
-                $errorLine,
-                $errorTypeString
-            );
+        if ($this->errorHeroModuleConfig['display-settings']['display_errors'] === 0 || $errorExcluded) {
+            error_reporting(E_ALL | E_STRICT);
+            ini_set('display_errors', 0);
         }
 
-        $this->showDefaultViewWhenDisplayErrorSetttingIsDisabled();
+        if (! $errorExcluded) {
+            $this->showDefaultViewWhenDisplayErrorSetttingIsDisabled();
+        }
     }
 
     /**