[WIP] Match expander #35

README.md

@@ -83,6 +83,7 @@ $matcher->getError(); // returns null or error message
 * ``inArray($value)``
 * ``oneOf(...$expanders)`` - example usage ``"@[email protected](contains('foo'), contains('bar'), contains('baz'))"``
 * ``matchRegex($regex)`` - example usage ``"@[email protected]('/^lorem.+/')"``
+* ``match($subPattern)`` - example usage ``"@[email protected]({"id": "@integer@"})"``
 
 ##Example usage
 
@@ -97,7 +98,7 @@ $factory = new SimpleFactory();
 $matcher = $factory->createMatcher();
 
 $matcher->match(1, 1);
-$matcher->match('string', 'string')
+$matcher->match('string', 'string');
 ```
 
 ### String matching
@@ -111,7 +112,7 @@ $factory = new SimpleFactory();
 $matcher = $factory->createMatcher();
 
 $matcher->match('Norbert', '@string@');
-$matcher->match("lorem ipsum dolor", "@[email protected]('lorem').contains('ipsum').endsWith('dolor')")
+$matcher->match("lorem ipsum dolor", "@[email protected]('lorem').contains('ipsum').endsWith('dolor')");
 
 ```
 
@@ -185,12 +186,12 @@ use Coduo\PHPMatcher\Factory\SimpleFactory;
 $factory = new SimpleFactory();
 $matcher = $factory->createMatcher();
 
-$matcher->match("@integer@", "@*@"),
-$matcher->match("foobar", "@*@"),
-$matcher->match(true, "@*@"),
-$matcher->match(6.66, "@*@"),
-$matcher->match(array("bar"), "@wildcard@"),
-$matcher->match(new \stdClass, "@wildcard@"),
+$matcher->match("@integer@", "@*@");
+$matcher->match("foobar", "@*@");
+$matcher->match(true, "@*@");
+$matcher->match(6.66, "@*@");
+$matcher->match(array("bar"), "@wildcard@");
+$matcher->match(new \stdClass, "@wildcard@");
 ```
 
 ### Expression matching 
@@ -274,7 +275,7 @@ $matcher->match(
       '@boolean@',
       '@double@'
   )  
-)
+);
 ```
 
 ### Json matching 
@@ -307,7 +308,7 @@ $matcher->match(
       }
     ]
   }'
-)
+);
 
 ```
 
@@ -355,6 +356,52 @@ XML
         );
 ```
 
+### Nested Object matching
+
+```php
+
+$factory = new SimpleFactory();
+$matcher = $factory->createMatcher();
+
+$matcher->match(<<<JSON
+    {
+        "id": 1,
+        "galleries": [
+            [
+                "id": 1,
+                "cover": null,
+                "images": [['id': 1], ['id': 2]],
+            ],
+            [
+                "id": 1,
+                "cover": null,
+                "images": [['id': 1], ['id': 2]],
+            ]
+        ]   
+    }
+JSON, <<<JSON
+    {
+        "id": "@integer@",
+        "galleries": '
+            @[email protected]({
+                "id": "@integer@",
+                "cover": \'
+                    @null@||@[email protected]({
+                        "id": "@integer@"
+                    })
+                \',
+                "images": \'
+                    @[email protected]({
+                        "id": "@integer@"
+                    })
+                \'
+            })
+        '
+    }
+JSON);
+
+```
+
 Example scenario for api in behat using mongo.
 ---
 ``` cucumber

src/AST/Node.php

@@ -4,5 +4,4 @@
 
 interface Node
 {
-
 }

src/Factory/SimpleFactory.php

@@ -9,6 +9,8 @@
 
 class SimpleFactory implements Factory
 {
+    private $parser;
+
     /**
      * @return Matcher
      */
@@ -22,41 +24,61 @@ public function createMatcher()
      */
     protected function buildMatchers()
     {
+        $parser = $this->buildParser();
         $scalarMatchers = $this->buildScalarMatchers();
-        $orMatcher = $this->buildOrMatcher();
+        $orMatcher = $this->buildOrMatcher($scalarMatchers);
+        $jsonMatcher = $this->buildJsonObjectMatcher($scalarMatchers);
+        $arrayMatcher = $this->buildArrayMatcher($scalarMatchers, $orMatcher, $jsonMatcher, $parser);
 
         $chainMatcher = new Matcher\ChainMatcher(array(
-            $scalarMatchers,
             $orMatcher,
-            new Matcher\JsonMatcher($orMatcher),
-            new Matcher\XmlMatcher($orMatcher),
-            new Matcher\TextMatcher($scalarMatchers, $this->buildParser())
+            $jsonMatcher,
+            $scalarMatchers,
+            $arrayMatcher,
         ));
 
-        return $chainMatcher;
+        $decoratedMatcher = new Matcher\ChainMatcher([
+            $chainMatcher,
+            new Matcher\JsonMatcher($chainMatcher),
+            new Matcher\XmlMatcher($chainMatcher),
+            new Matcher\TextMatcher($chainMatcher, $parser),
+        ]);
+
+        return $decoratedMatcher;
+    }
+
+    protected function buildArrayMatcher(
+        Matcher\ValueMatcher $scalarMatchers,
+        Matcher\ValueMatcher $orMatcher,
+        Matcher\ValueMatcher $jsonMatcher,
+        Parser $parser
+    )
+    {
+        return new Matcher\ArrayMatcher(new Matcher\ChainMatcher([
+            $orMatcher,
+            $scalarMatchers,
+            $jsonMatcher
+        ]), $parser);
     }
 
     /**
-     * @return Matcher\ChainMatcher
+     * @return Matcher\ValueMatcher
      */
-    protected function buildOrMatcher()
+    protected function buildOrMatcher(Matcher\ChainMatcher $scalarMatchers)
     {
-        $scalarMatchers = $this->buildScalarMatchers();
-        $orMatcher = new Matcher\OrMatcher($scalarMatchers);
-        $arrayMatcher = new Matcher\ArrayMatcher(
-            new Matcher\ChainMatcher(array(
-                $orMatcher,
-                $scalarMatchers
-            )),
-            $this->buildParser()
-        );
+        $chainMatcher = new Matcher\ChainMatcher([
+            $scalarMatchers,
+            $this->buildJsonObjectMatcher($scalarMatchers)
+        ]);
 
-        $chainMatcher = new Matcher\ChainMatcher(array(
-            $orMatcher,
-            $arrayMatcher,
-        ));
+        return new Matcher\OrMatcher($chainMatcher);
+    }
 
-        return $chainMatcher;
+    protected function buildJsonObjectMatcher(Matcher\ValueMatcher $scalarMatchers)
+    {
+        $parser = $this->buildParser();
+
+        return new Matcher\JsonObjectMatcher($scalarMatchers, $parser);
     }
 
     /**
@@ -86,6 +108,10 @@ protected function buildScalarMatchers()
      */
     protected function buildParser()
     {
-        return new Parser(new Lexer(), new Parser\ExpanderInitializer());
+        if ($this->parser) {
+            return $this->parser;
+        }
+
+        return $this->parser = new Parser(new Lexer(), new Parser\ExpanderInitializer());
     }
 }

src/Matcher/JsonObjectMatcher.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace Coduo\PHPMatcher\Matcher;
+
+use Coduo\PHPMatcher\Parser;
+use Coduo\ToString\StringConverter;
+use Symfony\Component\PropertyAccess\PropertyAccessor;
+
+final class JsonObjectMatcher extends Matcher
+{
+    const JSON_PATTERN = '@json@';
+
+    /**
+     * @var ValueMatcher
+     */
+    private $propertyMatcher;
+
+    /**
+     * @var PropertyAccessor
+     */
+    private $accessor;
+
+    /**
+     * @var Parser
+     */
+    private $parser;
+
+    /**
+     * @param ValueMatcher $propertyMatcher
+     */
+    public function __construct(ValueMatcher $propertyMatcher, Parser $parser)
+    {
+        $this->propertyMatcher = $propertyMatcher;
+        $this->parser = $parser;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function match($value, $pattern)
+    {
+        if (!$this->isJsonPattern($pattern)) {
+            return false;
+        }
+
+        if (!is_array($value)) {
+            $this->error = sprintf("%s \"%s\" is not a valid array.", gettype($value), new StringConverter($value));
+            return false;
+        }
+
+        if ($this->isJsonPattern($pattern)) {
+            return $this->allExpandersMatch($value, $pattern);
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function canMatch($pattern)
+    {
+        return is_string($pattern) && $this->isJsonPattern($pattern);
+    }
+
+    private function isJsonPattern($pattern)
+    {
+        if (!is_string($pattern)) {
+            return false;
+        }
+
+        return $this->parser->hasValidSyntax($pattern) && $this->parser->parse($pattern)->is('json');
+    }
+
+    /**
+     * @param $value
+     * @param $pattern
+     * @return bool
+     * @throws \Coduo\PHPMatcher\Exception\UnknownExpanderException
+     */
+    private function allExpandersMatch($value, $pattern)
+    {
+        $typePattern = $this->parser->parse($pattern);
+        if (!$typePattern->matchExpanders($value)) {
+            $this->error = $typePattern->getError();
+            return false;
+        }
+
+        return true;
+    }
+}

src/Matcher/OrMatcher.php

@@ -25,8 +25,10 @@ public function __construct(ChainMatcher $chainMatcher)
     public function match($value, $pattern)
     {
         $patterns = explode('||', $pattern);
+        $patterns = array_map('trim', $patterns);
+
         foreach ($patterns as $childPattern) {
-            if ($this->matchChild($value, $childPattern)){
+            if ($this->matchChild($value, $childPattern)) {
                 return true;
             }
         }

src/Matcher/Pattern/Expander/Match.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;
+
+use Coduo\PHPMatcher\Factory\SimpleFactory;
+use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
+use Coduo\ToString\StringConverter;
+
+final class Match implements PatternExpander
+{
+    /**
+     * @var null|string
+     */
+    private $error;
+
+    /**
+     * @var
+     */
+    private $value;
+
+    /**
+     * @param $value
+     */
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * @param $value
+     * @return boolean
+     */
+    public function match($value)
+    {
+        if (!is_array($value)) {
+            $this->error = sprintf("Match expander require \"array\", got \"%s\".", new StringConverter($value));
+            return false;
+        }
+
+        $match = true;
+        $matcher = (new SimpleFactory)->createMatcher();
+        foreach ($value as $singleRowValue) {
+            if (!$matcher->match($singleRowValue, $this->value)) {
+                $match = false;
+                $this->error = $matcher->getError();
+            }
+        }
+        unset($matcher);
+
+        return $match;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+}