Adding chain matcher and refactoring

Author: defrag

composer.json

@@ -8,7 +8,7 @@
         "symfony/property-access": "~2.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*@dev"
+        "phpunit/phpunit": "3.7.*"
     },
     "autoload": {
         "psr-0": {

src/JsonMatcher/ArrayMatcher.php

@@ -1,81 +1,29 @@
 <?php
 namespace JsonMatcher;
 
-class Matcher
-{
-    public function match($matcher, $matchTo)
-    {
-
-        if (is_array($matcher)) {
-            if (-1 === $this->matchArray($matcher, $matchTo)) {
-               return false;
-            }
-        } elseif(is_scalar($matcher) && strpos($matchTo, '@') > -1) {
-            if (-1 === $this->matchType($matcher, $matchTo)) {
-                return false;
-            }
-        } elseif (is_scalar($matcher)) {
-            if (-1 === $this->matchScalar($matcher, $matchTo)) {
-                return false;
-            }
-        }
-        return true;
-    }
+use JsonMatcher\Matcher\PropertyMatcher;
 
+class Matcher implements PropertyMatcher
+{
+    /**
+     * @var Matcher\PropertyMatcher
+     */
+    private $matcher;
 
-    private function matchScalar($json, $expectedJson)
+    public function __construct(PropertyMatcher $matcher)
     {
-        if ($json !== $expectedJson) {
-            return -1;
-        }
+        $this->matcher = $matcher;
     }
 
-    private function matchType($json, $type)
+    public function match($matcher, $pattern)
     {
-        $type = str_replace("@", "", $type);
-
-        if (gettype($json) !== $type) {
-            return -1;
-        }
+        return $this->matcher->match($matcher, $pattern);
     }
 
-
-    private function matchArray(array $array, array $arrayToMatch)
+    public function canMatch($pattern)
     {
-
-        if (count($array) !== count($arrayToMatch) ) {
-            return -1;
-        }
-
-        $match = function($value, $array, $arrayToMatch) {
-
-            $key = array_search($value, $arrayToMatch);
-            if ($key !== false) {
-                $this->match($array[$key], $arrayToMatch[$key]);
-
-                return true;
-            }
-
-            $key = array_search($value, $array);
-            if (is_scalar($arrayToMatch[$key]) && strpos($arrayToMatch[$key], '@') > - 1) {
-                $this->match($value, $arrayToMatch[$key]);
-
-                return true;
-            } else {
-                return false;
-            }
-
-        };
-
-        foreach ($array as $value) {
-
-            if ($match($value, $array, $arrayToMatch)) {
-                //unset($array[$key], $arrayToMatch[$key]);
-            } else {
-                return -1;
-            }
-        }
+        return true;
     }
 
-    
+
 }

src/JsonMatcher/Matcher.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace JsonMatcher\Matcher;
+
+use JsonMatcher\Matcher\PropertyMatcher;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException;
+class ArrayMatcher implements PropertyMatcher
+{
+    /**
+     * @var Matcher\PropertyMatcher
+     */
+    private $propertyMatcher;
+
+    public function __construct(PropertyMatcher $propertyMatcher)
+    {
+        $this->propertyMatcher = $propertyMatcher;
+    }
+
+    public function match($matcher, $pattern)
+    {
+        $accessorBuilder = PropertyAccess::createPropertyAccessorBuilder();
+        $accessorBuilder->enableExceptionOnInvalidIndex();
+        $accessor = $accessorBuilder->getPropertyAccessor();
+
+        $paths = [];
+        foreach ($matcher as $key => $element) {
+            $path = sprintf("[%s]", $key);
+
+            if (is_array($element)) {
+                $this->buildPath($element, $path);
+                continue;
+            }
+
+            $paths[] = $path;
+        }
+
+        foreach ($paths as $path) {
+            $value = $accessor->getValue($matcher, $path);
+            try {
+                $patternValue = $accessor->getValue($pattern, $path);
+            } catch (NoSuchIndexException $e) {
+                return false;
+            }
+
+            if ($this->propertyMatcher->canMatch($patternValue)) {
+                if (false === $this->propertyMatcher->match($value, $patternValue)) {
+                    return false;
+                }
+            }
+
+        }
+
+        return true;
+    }
+
+    public function canMatch($pattern)
+    {
+        return is_array($pattern);
+    }
+
+
+    private function buildPath(array $array, $parentPath)
+    {
+        foreach ($array as $key => $element) {
+            $path = sprintf("%s[%s]", $parentPath, $key);
+
+            if (is_array($element)) {
+                $this->buildPath($element, $path);
+                continue;
+            }
+
+            $this->paths[] = $path;
+        }
+    }
+}

src/JsonMatcher/Matcher/ArrayMatcher.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace JsonMatcher\Matcher;
+
+class ChainMatcher implements PropertyMatcher
+{
+    private $matchers;
+
+    public function __construct(array $matchers = array())
+    {
+        $this->matchers = $matchers;
+    }
+
+    public function addMatcher(PropertyMatcher $matcher)
+    {
+        $this->matchers[] = $matcher;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function match($matcher, $pattern)
+    {
+        foreach ($this->matchers as $m) {
+            if (false === $m->match($matcher, $pattern)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function canMatch($pattern)
+    {
+        return true;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return 'chain';
+    }
+}

src/JsonMatcher/Matcher/ChainMatcher.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace JsonMatcher\Matcher;
+
+interface PropertyMatcher
+{
+    public function match($matcher, $pattern);
+
+    public function canMatch($pattern);
+
+}

src/JsonMatcher/Matcher/PropertyMatcher.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace JsonMatcher\Matcher;
+
+class ScalarMatcher implements PropertyMatcher
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    public function match($matcher, $pattern)
+    {
+        return $matcher === $pattern;
+    }
+
+    public function canMatch($pattern)
+    {
+        return is_scalar($pattern);
+    }
+
+}

src/JsonMatcher/Matcher/ScalarMatcher.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace JsonMatcher\Matcher;
+
+class TypeMatcher implements PropertyMatcher
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    public function match($matcher, $pattern)
+    {
+        return gettype($matcher) === $this->extractType($pattern);
+    }
+
+    public function canMatch($pattern)
+    {
+        return is_scalar($pattern);
+    }
+
+    private function extractType($pattern)
+    {
+        return str_replace("@", "", $pattern);
+    }
+
+}