Update tests

Author: norberttech

Diff for: src/JsonMatcher/Matcher.php

@@ -15,9 +15,9 @@ public function __construct(PropertyMatcher $matcher)
         $this->matcher = $matcher;
     }
 
-    public function match($matcher, $pattern)
+    public function match($value, $pattern)
     {
-        return $this->matcher->match($matcher, $pattern);
+        return $this->matcher->match($value, $pattern);
     }
 
     public function canMatch($pattern)
@@ -26,4 +26,4 @@ public function canMatch($pattern)
     }
 
 
-}
+}

Diff for: src/JsonMatcher/Matcher/ArrayMatcher.php

@@ -2,49 +2,51 @@
 
 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
+     * @var PropertyMatcher
      */
     private $propertyMatcher;
 
+    private $paths;
+
     public function __construct(PropertyMatcher $propertyMatcher)
     {
         $this->propertyMatcher = $propertyMatcher;
     }
 
-    public function match($matcher, $pattern)
+    public function match($value, $pattern)
     {
         $accessorBuilder = PropertyAccess::createPropertyAccessorBuilder();
         $accessorBuilder->enableExceptionOnInvalidIndex();
         $accessor = $accessorBuilder->getPropertyAccessor();
 
-        $paths = [];
-        foreach ($matcher as $key => $element) {
+        $this->paths = [];
+        foreach ($value as $key => $element) {
             $path = sprintf("[%s]", $key);
 
             if (is_array($element)) {
                 $this->buildPath($element, $path);
                 continue;
             }
 
-            $paths[] = $path;
+            $this->paths[] = $path;
         }
 
-        foreach ($paths as $path) {
-            $value = $accessor->getValue($matcher, $path);
+        foreach ($this->paths as $path) {
+            $elementValue = $accessor->getValue($value, $path);
             try {
                 $patternValue = $accessor->getValue($pattern, $path);
             } catch (NoSuchIndexException $e) {
                 return false;
             }
 
             if ($this->propertyMatcher->canMatch($patternValue)) {
-                if (false === $this->propertyMatcher->match($value, $patternValue)) {
+                if (false === $this->propertyMatcher->match($elementValue, $patternValue)) {
                     return false;
                 }
             }

Diff for: src/JsonMatcher/Matcher/ChainMatcher.php

@@ -19,10 +19,10 @@ public function addMatcher(PropertyMatcher $matcher)
     /**
      * {@inheritDoc}
      */
-    public function match($matcher, $pattern)
+    public function match($value, $pattern)
     {
-        foreach ($this->matchers as $m) {
-            if (false === $m->match($matcher, $pattern)) {
+        foreach ($this->matchers as $propertyMatcher) {
+            if (false === $propertyMatcher->match($value, $pattern)) {
                 return false;
             }
         }
@@ -43,4 +43,4 @@ public function getName()
     {
         return 'chain';
     }
-}
+}

Diff for: src/JsonMatcher/Matcher/PropertyMatcher.php

@@ -4,8 +4,8 @@
 
 interface PropertyMatcher
 {
-    public function match($matcher, $pattern);
+    public function match($value, $pattern);
 
     public function canMatch($pattern);
 
-}
+}

Diff for: src/JsonMatcher/Matcher/ScalarMatcher.php

@@ -4,18 +4,16 @@
 
 class ScalarMatcher implements PropertyMatcher
 {
-
     /**
      * {@inheritDoc}
      */
-    public function match($matcher, $pattern)
+    public function match($value, $pattern)
     {
-        return $matcher === $pattern;
+        return $value === $pattern;
     }
 
     public function canMatch($pattern)
     {
         return is_scalar($pattern);
     }
-
-}
+}

Diff for: src/JsonMatcher/Matcher/TypeMatcher.php

@@ -8,9 +8,9 @@ class TypeMatcher implements PropertyMatcher
     /**
      * {@inheritDoc}
      */
-    public function match($matcher, $pattern)
+    public function match($value, $pattern)
     {
-        return gettype($matcher) === $this->extractType($pattern);
+        return gettype($value) === $this->extractType($pattern);
     }
 
     public function canMatch($pattern)
@@ -23,4 +23,4 @@ private function extractType($pattern)
         return str_replace("@", "", $pattern);
     }
 
-}
+}

Diff for: tests/JsonMatcher/ArrayMatcherTest.php

@@ -7,7 +7,6 @@
 
 class ArrayMatcherTest extends \PHPUnit_Framework_TestCase
 {
-
     private $simpleArray;
 
     public function setUp()
@@ -36,8 +35,6 @@ public function test_match_arrays()
         $chain->addMatcher(new ScalarMatcher());
         $matcher = new ArrayMatcher($chain);
 
-
-
         $this->assertTrue($matcher->match($this->simpleArray, $this->simpleArray));
         $this->assertTrue($matcher->match([], []));
         $this->assertFalse($matcher->match($this->simpleArray, []));
@@ -56,6 +53,4 @@ public function test_match_arrays()
             ]
         ]));
     }
-
-
 }

Diff for: tests/JsonMatcher/ScalarMatcherTest.php

@@ -0,0 +1,17 @@
+<?php 
+namespace JsonMatcher\Tests;
+
+use JsonMatcher\Matcher;
+
+class ScalarMatcherTest extends \PHPUnit_Framework_TestCase
+{
+    public function test_match_scalars()
+    {
+        $matcher = new Matcher\ScalarMatcher();
+
+        $this->assertTrue($matcher->match(1, 1));
+        $this->assertTrue($matcher->match("michal", "michal"));
+        $this->assertFalse($matcher->match(false, "false"));
+        $this->assertFalse($matcher->match(false, 0));
+    }
+}