Fix Repeat expander in JSON Context (#151)

* Fix Repeat expander in JSON Context

Fixes #150

* Add repeat expanders tests

* Fix repeat test

* Too bad one can't use array universal key inside repeat expander

* Fix JSON in tests

Author: JarJak

src/Matcher/Pattern/Expander/Repeat.php

@@ -26,21 +26,25 @@ public static function is(string $name) : bool
         return self::NAME === $name;
     }
 
-    public function __construct(string $pattern, bool $isStrict = true)
+    /**
+     * @param array|string $pattern array to be matched or json-encoded string
+     */
+    public function __construct($pattern, bool $isStrict = true)
     {
-        if (!\is_string($pattern)) {
-            throw new \InvalidArgumentException('Repeat pattern must be a string.');
-        }
-
         $this->pattern = $pattern;
         $this->isStrict = $isStrict;
         $this->isScalar = true;
 
-        $json = \json_decode($pattern, true);
-
-        if ($json !== null && \json_last_error() === JSON_ERROR_NONE) {
-            $this->pattern = $json;
+        if (\is_string($pattern)) {
+            $json = \json_decode($pattern, true);
+            if ($json !== null && \json_last_error() === JSON_ERROR_NONE) {
+                $this->pattern = $json;
+                $this->isScalar = false;
+            }
+        } elseif (\is_array($pattern)) {
             $this->isScalar = false;
+        } else {
+            throw new \InvalidArgumentException('Repeat pattern must be a string or an array.');
         }
     }
 
@@ -80,11 +84,6 @@ private function matchScalar(array $values, Matcher $matcher) : bool
         return true;
     }
 
-    /**
-     * @param array $values
-     * @param Matcher $matcher
-     * @return bool
-     */
     private function matchJson(array $values, Matcher $matcher) : bool
     {
         $patternKeys = \array_keys($this->pattern);

tests/Matcher/JsonMatcherTest.php

@@ -150,6 +150,7 @@ public static function negativePatterns()
         return [
             ['@string@'],
             ['["Norbert", '],
+            ['@[email protected]({"name": "@string@", "value": "@array@"})']
         ];
     }
 
@@ -215,6 +216,10 @@ public static function positiveMatches()
             [
                 '[{"name": "Norbert","lastName":"Orzechowicz"},{"name":"Michał"},{"name":"Bob"},{"name":"Martin"}]',
                 '[{"name": "Norbert","@*@":"@*@"},@...@]'
+            ],
+            [
+                '[{"name": "Norbert"},{"name":"Michał"},{"name":"Bob"},{"name":"Martin"}]',
+                '"@[email protected]({\"name\": \"@string@\"})"'
             ]
         ];
     }
@@ -242,6 +247,10 @@ public static function negativeMatches()
                 '{"foo":"foo val","bar":"bar val"}',
                 '{"foo":"foo val"}'
             ],
+            [
+                '[{"name": "Norbert","lastName":"Orzechowicz"},{"name":"Michał"},{"name":"Bob"},{"name":"Martin"}]',
+                '"@[email protected]({\"name\": \"@string@\"})"'
+            ],
             [
                 [],
                 '[]'