ArrayUtils::checkIssetKeys : Modify method with not strict comparaison

smartbooster · Mar 27, 2024 · be469f9 · be469f9
1 parent 1c772b9
commit be469f9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 CHANGELOG for 1.x
 ===================
+## v1.1.1 - (2024-03-27)
+### Fix
+
+- `ArrayUtils::checkIssetKeys` : Modify method with not strict comparaison
+
 ## v1.1.0 - (2024-03-25)
 ### Added
 - new `ArrayUtils` methods : `checkIssetKeys`, `trimExplode`, `removeEmpty`, `filterByPattern`, `flatToMap`

diff --git a/src/Utils/ArrayUtils.php b/src/Utils/ArrayUtils.php
@@ -152,14 +152,21 @@ public static function flattenArrayValues(array $input, string $separator = ',')
     }
 
     /**
-     * Check if all keys are in array
+     * Check if all keys are set in array
+     * It's not a strict comparaison, all array values may not be in keys
      *
      * @param array $array array to compare
      * @param array $keys keys to check
      */
     public static function checkIssetKeys(array $array, array $keys): bool
     {
-        return empty(array_diff(array_keys($array), $keys));
+        foreach ($keys as $key) {
+            if (!isset($array[$key])) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     /**

diff --git a/tests/Utils/ArrayUtilsTest.php b/tests/Utils/ArrayUtilsTest.php
@@ -357,9 +357,9 @@ public function checkIssetKeysProvider(): array
                 // $keys
                 [0, 1, 5],
             ],
-            'last missing' => [
+            'one missing' => [
                 // expected
-                false,
+                true,
                 // array
                 [
                     0 => "000",
@@ -369,14 +369,13 @@ public function checkIssetKeysProvider(): array
                 // $keys
                 [0, 1],
             ],
-            'first missing' => [
+            'key is not present' => [
                 // expected
                 false,
                 // array
                 [
                     'dummy' => "dummy",
                     'foo' => "foo",
-                    'bar' => "bar",
                 ],
                 // $keys
                 ['foo', 'bar'],