Fix matching for '@array@||@null@' (#493)

Co-authored-by: Eric GELOEN <[email protected]>
coduo · Oct 7, 2024 · c2303ed · c2303ed
1 parent 6145a0e
commit c2303ed
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/Factory/MatcherFactory.php b/src/Factory/MatcherFactory.php
@@ -49,21 +49,22 @@ private function buildMatchers(Parser $parser, Backtrace $backtrace) : Matcher\C
 
     private function buildArrayMatcher(Matcher\ChainMatcher $scalarMatchers, Parser $parser, Backtrace $backtrace) : Matcher\ArrayMatcher
     {
-        $orMatcher = new Matcher\OrMatcher($backtrace, $scalarMatchers);
-
-        return new Matcher\ArrayMatcher(
+        $arrayMatcher = new Matcher\ArrayMatcher(
             new Matcher\ChainMatcher(
                 'array',
                 $backtrace,
                 [
-                    $orMatcher,
+                    new Matcher\OrMatcher($backtrace, $orMatchers = clone $scalarMatchers),
                     $scalarMatchers,
                     new Matcher\TextMatcher($backtrace, $parser),
                 ]
             ),
             $backtrace,
             $parser
         );
+        $orMatchers->registerMatcher($arrayMatcher);
+
+        return $arrayMatcher;
     }
 
     private function buildScalarMatchers(Parser $parser, Backtrace $backtrace) : Matcher\ChainMatcher

diff --git a/src/Matcher/ChainMatcher.php b/src/Matcher/ChainMatcher.php
@@ -36,6 +36,11 @@ public function __construct(string $name, Backtrace $backtrace, array $matchers
         $this->name = $name;
     }
 
+    public function registerMatcher(ValueMatcher $matcher) : void
+    {
+        $this->matchers[] = $matcher;
+    }
+
     public function match($value, $pattern) : bool
     {
         $this->backtrace->matcherEntrance($this->matcherName(), $value, $pattern);

diff --git a/tests/Matcher/OrMatcherTest.php b/tests/Matcher/OrMatcherTest.php
@@ -65,6 +65,14 @@ public static function positiveMatchData()
                     'test' => '@integer@||@null@',
                 ],
             ],
+            [
+                [
+                    'test' => [],
+                ],
+                [
+                    'test' => '@array@||@null@',
+                ],
+            ],
             [
                 [
                     'first_level' => ['second_level', ['third_level']],