utilize samsonasik/ArrayLookup

samsonasik · Jan 11, 2023 · e62b21c · e62b21c
1 parent 73c7f85
commit e62b21c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -44,6 +44,7 @@
         "laminas/laminas-psr7bridge": "^1.8",
         "laminas/laminas-uri": "^2.10",
         "psr/container": "^1.1.2 || 2.0",
+        "samsonasik/array-lookup": "^1.0",
         "seld/jsonlint": "^1.9",
         "webmozart/assert": "^1.11"
     },

diff --git a/src/HeroFunction.php b/src/HeroFunction.php
@@ -4,6 +4,7 @@
 
 namespace ErrorHeroModule;
 
+use ArrayLookup\AtLeast;
 use Seld\JsonLint\JsonParser;
 use Throwable;
 
@@ -24,23 +25,17 @@ function detectMessageContentType(string $message): string
 function isExcludedException(array $excludeExceptionsConfig, Throwable $throwable): bool
 {
     $exceptionOrErrorClass = $throwable::class;
+    $message               = $throwable->getMessage();
 
-    $isExcluded = false;
-    foreach ($excludeExceptionsConfig as $excludeExceptionConfig) {
-        if ($exceptionOrErrorClass === $excludeExceptionConfig) {
-            $isExcluded = true;
-            break;
+    $filter = static function (string|array $excludeExceptionConfig) use ($exceptionOrErrorClass, $message): bool {
+        if ($excludeExceptionConfig === $exceptionOrErrorClass) {
+            return true;
         }
 
-        if (
-            is_array($excludeExceptionConfig)
+        return is_array($excludeExceptionConfig)
             && $excludeExceptionConfig[0] === $exceptionOrErrorClass
-            && $excludeExceptionConfig[1] === $throwable->getMessage()
-        ) {
-            $isExcluded = true;
-            break;
-        }
-    }
+            && $excludeExceptionConfig[1] === $message;
+    };
 
-    return $isExcluded;
+    return AtLeast::once($excludeExceptionsConfig, $filter);
 }