Merge pull request #50 from pskt/callback-matcher-on-function-names

Norbert Orzechowicz · Norbert Orzechowicz · commit 3fcfd66ab8cf · 2015-02-05T19:05:27.000+01:00
CallbackMatcher should not be executed for internal function names
diff --git a/src/Coduo/PHPMatcher/Matcher/CallbackMatcher.php b/src/Coduo/PHPMatcher/Matcher/CallbackMatcher.php
@@ -17,6 +17,6 @@ public function match($value, $pattern)
      */
     public function canMatch($pattern)
     {
-        return is_callable($pattern);
+        return is_object($pattern) && is_callable($pattern);
     }
 }
diff --git a/tests/Coduo/PHPMatcher/Matcher/CallbackMatcherTest.php b/tests/Coduo/PHPMatcher/Matcher/CallbackMatcherTest.php
@@ -15,6 +15,7 @@ function test_negative_can_match()
     {
         $matcher = new CallbackMatcher();
         $this->assertFalse($matcher->canMatch(new \DateTime()));
+        $this->assertFalse($matcher->canMatch('SIN'));
     }
 
     function test_positive_matches()

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ public function match($value, $pattern)`
`17`	`17`	`*/`
`18`	`18`	`public function canMatch($pattern)`
`19`	`19`	`{`
`20`		`- return is_callable($pattern);`
	`20`	`+ return is_object($pattern) && is_callable($pattern);`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ function test_negative_can_match()`
`15`	`15`	`{`
`16`	`16`	`$matcher = new CallbackMatcher();`
`17`	`17`	`$this->assertFalse($matcher->canMatch(new \DateTime()));`
	`18`	`+ $this->assertFalse($matcher->canMatch('SIN'));`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`function test_positive_matches()`