Merge pull request #92 from samsonasik/use-more-array-lookup

More usage of ArrayLookup

Author: samsonasik

.gitattributes

@@ -3,6 +3,7 @@
 /.gitignore export-ignore
 /.travis.yml export-ignore
 /phpstan.neon export-ignore
+/phpstan-baseline.neon export-ignore
 /spec/ export-ignore
 /CONTRIBUTING.md export-ignore
 /kahlan-config.php export-ignore

phpstan-baseline.neon

@@ -0,0 +1,56 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Access to an undefined property ErrorHeroModule\\\\Command\\\\BaseLoggingCommand\\:\\:\\$request\\.$#"
+			count: 1
+			path: src/Command/BaseLoggingCommand.php
+
+		-
+			message: "#^Access to private property \\$this\\(ErrorHeroModule\\\\Command\\\\BaseLoggingCommand\\)&ErrorHeroModule\\\\Listener\\\\Mvc\\:\\:\\$mvcEvent\\.$#"
+			count: 1
+			path: src/Command/BaseLoggingCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int\\)\\: bool\\)\\|null, array\\{\\$this\\(ErrorHeroModule\\\\Command\\\\BaseLoggingCommand\\)\\|\\(\\$this\\(ErrorHeroModule\\\\Command\\\\BaseLoggingCommand\\)&ErrorHeroModule\\\\Listener\\\\Mvc\\), 'phpErrorHandler'\\} given\\.$#"
+			count: 1
+			path: src/Command/BaseLoggingCommand.php
+
+		-
+			message: "#^Invalid type object to throw\\.$#"
+			count: 1
+			path: src/Handler/Logging.php
+
+		-
+			message: "#^Access to an undefined property ErrorHeroModule\\\\Listener\\\\Mvc\\:\\:\\$request\\.$#"
+			count: 1
+			path: src/Listener/Mvc.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int\\)\\: bool\\)\\|null, array\\{\\$this\\(ErrorHeroModule\\\\Listener\\\\Mvc\\)\\|\\(\\$this\\(ErrorHeroModule\\\\Listener\\\\Mvc\\)&ErrorHeroModule\\\\Listener\\\\Mvc\\), 'phpErrorHandler'\\} given\\.$#"
+			count: 1
+			path: src/Listener/Mvc.php
+
+		-
+			message: "#^Parameter \\#1 \\$mvcEvent of method ErrorHeroModule\\\\Listener\\\\Mvc\\:\\:exceptionError\\(\\) expects Laminas\\\\Mvc\\\\MvcEvent, ErrorException given\\.$#"
+			count: 2
+			path: src/Listener/Mvc.php
+
+		-
+			message: "#^Result of method ErrorHeroModule\\\\Listener\\\\Mvc\\:\\:exceptionError\\(\\) \\(void\\) is used\\.$#"
+			count: 1
+			path: src/Listener/Mvc.php
+
+		-
+			message: "#^Access to private property \\$this\\(ErrorHeroModule\\\\Middleware\\\\Mezzio\\)&ErrorHeroModule\\\\Listener\\\\Mvc\\:\\:\\$mvcEvent\\.$#"
+			count: 4
+			path: src/Middleware/Mezzio.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int\\)\\: bool\\)\\|null, array\\{\\$this\\(ErrorHeroModule\\\\Middleware\\\\Mezzio\\)\\|\\(\\$this\\(ErrorHeroModule\\\\Middleware\\\\Mezzio\\)&ErrorHeroModule\\\\Listener\\\\Mvc\\), 'phpErrorHandler'\\} given\\.$#"
+			count: 1
+			path: src/Middleware/Mezzio.php
+
+		-
+			message: "#^Parameter \\#1 \\$throwable of method ErrorHeroModule\\\\Middleware\\\\Mezzio\\:\\:exceptionError\\(\\) expects Throwable, Laminas\\\\Mvc\\\\MvcEvent given\\.$#"
+			count: 1
+			path: src/Middleware/Mezzio.php

phpstan.neon

@@ -1,5 +1,6 @@
 includes:
 	- vendor/phpstan/phpstan-webmozart-assert/extension.neon
+	- phpstan-baseline.neon
 
 parameters:
 	excludePaths:
@@ -10,7 +11,3 @@ parameters:
 	reportUnmatchedIgnoredErrors: false
 	treatPhpDocTypesAsCertain: false
 	checkGenericClassInNonGenericObjectType: false
-	ignoreErrors:
-		- '#function set_error_handler expects (callable(int, string, string, int, array): bool)*#'
-		- '#Invalid type object to throw#'
-		- '#Instanceof between \*NEVER\* and ErrorHeroModule\\Listener\\Mvc will always evaluate to false#'

src/HeroTrait.php

@@ -4,6 +4,7 @@
 
 namespace ErrorHeroModule;
 
+use ArrayLookup\AtLeast;
 use ErrorException;
 use ErrorHeroModule\Command\BaseLoggingCommand;
 use ErrorHeroModule\Listener\Mvc;
@@ -123,18 +124,16 @@ public function phpErrorHandler(int $errorType, string $errorMessage, string $er
             return;
         }
 
-        foreach ($this->errorHeroModuleConfig['display-settings']['exclude-php-errors'] as $excludePhpError) {
-            if ($errorType === $excludePhpError) {
-                return;
-            }
-
-            if (
+        $filter = static fn (mixed $excludePhpError): bool =>
+            $errorType === $excludePhpError ||
+            (
                 is_array($excludePhpError)
                 && $excludePhpError[0] === $errorType
                 && $excludePhpError[1] === $errorMessage
-            ) {
-                return;
-            }
+            );
+
+        if (AtLeast::once($this->errorHeroModuleConfig['display-settings']['exclude-php-errors'], $filter)) {
+            return;
         }
 
         throw new ErrorException($errorMessage, 0, $errorType, $errorFile, $errorLine);