Correctly finds not existing keys when checking Array matcher pattern (#176)

* fixes #144

* remove unnecessary if statement

* catch multiple exception types in a single catch statement

Author: teklakct

src/Matcher/ArrayMatcher.php

@@ -129,24 +129,22 @@ private function iterateMatch(array $values, array $patterns, string $parentPath
 
     private function isPatternValid(array $pattern, array $values, string $parentPath) : bool
     {
-        if (\is_array($pattern)) {
-            $skipPattern = static::UNBOUNDED_PATTERN;
+        $skipPattern = static::UNBOUNDED_PATTERN;
 
-            $pattern = \array_filter(
-                $pattern,
-                function ($item) use ($skipPattern) {
-                    return $item !== $skipPattern;
-                }
-            );
+        $pattern = \array_filter(
+            $pattern,
+            function ($item) use ($skipPattern) {
+                return $item !== $skipPattern;
+            }
+        );
 
-            $notExistingKeys = $this->findNotExistingKeys($pattern, $values);
-            if (\count($notExistingKeys) > 0) {
-                $keyNames = \array_keys($notExistingKeys);
-                $path = $this->formatFullPath($parentPath, $this->formatAccessPath($keyNames[0]));
-                $this->setMissingElementInError('value', $path);
+        $notExistingKeys = $this->findNotExistingKeys($pattern, $values);
+        if (\count($notExistingKeys) > 0) {
+            $keyNames = \array_keys($notExistingKeys);
+            $path = $this->formatFullPath($parentPath, $this->formatAccessPath($keyNames[0]));
+            $this->setMissingElementInError('value', $path);
 
-                return false;
-            }
+            return false;
         }
 
         return true;
@@ -162,14 +160,12 @@ private function findNotExistingKeys(array $patterns, array $values) : array
 
         return \array_filter($notExistingKeys, function ($pattern) use ($values) {
             if (\is_array($pattern)) {
-                return !$this->match($values, $pattern);
+                return empty($pattern) || !$this->match($values, $pattern);
             }
 
             try {
                 $typePattern = $this->parser->parse($pattern);
-            } catch (Exception $e) {
-                return true;
-            } catch (\Throwable $t) {
+            } catch (Exception | \Throwable $e) {
                 return true;
             }
 

tests/ExpandersTest.php

@@ -54,6 +54,8 @@ public static function expanderExamples()
             ['', '@[email protected]()', true],
             [['foo', 'bar'], '@[email protected]("bar")', true],
             [[], '@[email protected]()', true],
+            [[], ['@string@'], false],
+            [[], ['@[email protected]()'], true],
             [['foo'], '@[email protected]()', false],
             [[1, 2, 3], '@[email protected](3)', true],
             [[1, 2, 3], '@[email protected](4)', false],
@@ -72,6 +74,8 @@ public static function expanderExamples()
             [[], ['unexistent_key' => '@[email protected]()'], true],
             [[], ['unexistent_key' => '@[email protected]()'], true],
             [[], ['unexistent_key' => '@[email protected]()'], true],
+            [[], ['unexistent_key' => '@[email protected]()', 'unexistent_second_key' => '@[email protected]()'], true],
+            [[], ['unexistent_key' => '@[email protected]()', 'unexistent_second_key' => '@string@'], false],
             [['Norbert', 'Michał'], '@[email protected]("@string@")', true],
             ['127.0.0.1', '@[email protected]()', true],
             ['2001:0db8:0000:42a1:0000:0000:ab1c:0001', '@[email protected]()', true],

tests/Matcher/ArrayMatcherTest.php

@@ -203,6 +203,7 @@ public static function positiveMatchData()
             [$simpleArr, $simpleArrPatternWithUniversalKey],
             [$simpleArr, $simpleArrPatternWithUniversalKeyAndStringValue],
             [[], []],
+            [[], ['@[email protected]()']],
             [['foo' => null], ['foo' => null]],
             [['foo' => null], ['foo' => '@null@']],
             [['key' => 'val'], ['key' => 'val']],
@@ -287,7 +288,9 @@ public static function negativeMatchData()
             [['key' => 'val'], ['key' => 'val2']],
             [[1], [2]],
             [['foo', 1, 3], ['foo', 2, 3]],
+            [[], ['key' => []]],
             [[], ['foo' => 'bar']],
+            [[], ['foo' => ['bar' => []]]],
             'unbound array should match one or none elements' => [
                 [
                     'users' => [