Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/JsonMatcher/Matcher.php
	src/JsonMatcher/Matcher/ScalarMatcher.php
	tests/JsonMatcher/ArrayMatcherTest.php

src/JsonMatcher/Matcher.php

@@ -24,6 +24,4 @@ public function canMatch($pattern)
     {
         return true;
     }
-
-
 }

src/JsonMatcher/Matcher/ArrayMatcher.php

@@ -61,7 +61,6 @@ public function canMatch($pattern)
         return is_array($pattern);
     }
 
-
     private function buildPath(array $array, $parentPath)
     {
         foreach ($array as $key => $element) {

src/JsonMatcher/Matcher/ChainMatcher.php

@@ -35,7 +35,6 @@ public function canMatch($pattern)
         return true;
     }
 
-
     /**
      * {@inheritDoc}
      */

src/JsonMatcher/Matcher/WildcardMatcher.php

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

src/autoload.php

@@ -23,4 +23,4 @@
     }
 
     return false;
-});
+});

tests/JsonMatcher/ArrayMatcherTest.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 namespace JsonMatcher\Tests;
 
 use JsonMatcher\Matcher\ArrayMatcher;

tests/JsonMatcher/MatcherTest.php

@@ -1,12 +1,10 @@
-<?php 
+<?php
 namespace JsonMatcher\Tests;
 
-use JsonMatcher\Matcher;
-
 class MatcherTest extends \PHPUnit_Framework_TestCase
 {
     public function test_foo()
     {
         $this->assertTrue(true);
     }
-}
+}

tests/JsonMatcher/PlaceholderMatcherTest.php

@@ -1,18 +1,17 @@
 <?php
 namespace JsonMatcher\Tests;
 
-use JsonMatcher\Matcher\TypeMatcher;
+use JsonMatcher\Matcher\WildcardMatcher;
 
 class TypeMatcherTest extends \PHPUnit_Framework_TestCase
 {
 
     public function test_type_placeholders()
     {
-        $matcher = new TypeMatcher();
+        $matcher = new WildcardMatcher();
         $this->assertTrue($matcher->match(1, "@integer"));
         $this->assertTrue($matcher->match("michal", "@string"));
         $this->assertTrue($matcher->match(false, "@boolean"));
         $this->assertTrue($matcher->match(6.66, "@double"));
     }
 }
-

tests/JsonMatcher/WildcardMatcherTest.php

@@ -0,0 +1,17 @@
+<?php
+namespace JsonMatcher\Tests;
+
+use JsonMatcher\Matcher\WildcardMatcher;
+
+class WildcardMatcherTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function test_type_placeholders()
+    {
+        $matcher = new WildcardMatcher();
+        $this->assertTrue($matcher->match('*', "@integer"));
+        $this->assertTrue($matcher->match("*", "foobar"));
+        $this->assertTrue($matcher->match("*", true));
+        $this->assertTrue($matcher->match("*", 6.66));
+    }
+}