move display_errors check early

samsonasik · Sep 21, 2018 · 6af28a0 · 6af28a0
1 parent 093f8e1
commit 6af28a0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/HeroTrait.php b/src/HeroTrait.php
@@ -78,11 +78,6 @@ public function phpErrorHandler(int $errorType, string $errorMessage, string $er
             return;
         }
 
-        if (! $this->errorHeroModuleConfig['display-settings']['display_errors']) {
-            \error_reporting(\E_ALL | \E_STRICT);
-            \ini_set('display_errors', '0');
-        }
-
         if (\in_array($errorType, $this->errorHeroModuleConfig['display-settings']['exclude-php-errors'])) {
             return;
         }

diff --git a/src/Listener/Mvc.php b/src/Listener/Mvc.php
@@ -61,6 +61,11 @@ public function phpError(MvcEvent $e) : void
     {
         $this->mvcEvent = $e;
 
+        if (! $this->errorHeroModuleConfig['display-settings']['display_errors']) {
+            \error_reporting(\E_ALL | \E_STRICT);
+            \ini_set('display_errors', '0');
+        }
+
         \ob_start([$this, 'phpFatalErrorHandler']);
         \register_shutdown_function([$this, 'execOnShutdown']);
         \set_error_handler([$this, 'phpErrorHandler']);

diff --git a/src/Middleware/Expressive.php b/src/Middleware/Expressive.php
@@ -64,6 +64,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
     public function phpError() : void
     {
+        if (! $this->errorHeroModuleConfig['display-settings']['display_errors']) {
+            \error_reporting(\E_ALL | \E_STRICT);
+            \ini_set('display_errors', '0');
+        }
+
         \ob_start([$this, 'phpFatalErrorHandler']);
         \register_shutdown_function([$this, 'execOnShutdown']);
         \set_error_handler([$this, 'phpErrorHandler']);