Merge pull request #460 from ciaranmcnulty/callable-matching

Compare callables as an exact match if they are identical

spec/Prophecy/Comparator/ClosureComparatorSpec.php

@@ -25,15 +25,15 @@ function it_accepts_only_closures()
         $this->accepts(function(){}, function(){})->shouldReturn(true);
     }
 
-    function it_asserts_that_all_closures_are_different()
+    function it_asserts_that_different_closures_are_different()
     {
         $this->shouldThrow()->duringAssertEquals(function(){}, function(){});
     }
 
-    function it_asserts_that_all_closures_are_different_even_if_its_the_same_closure()
+    function it_asserts_that_closures_are_equal_if_its_the_same_closure()
     {
         $closure = function(){};
 
-        $this->shouldThrow()->duringAssertEquals($closure, $closure);
+        $this->shouldNotThrow()->duringAssertEquals($closure, $closure);
     }
 }

src/Prophecy/Comparator/ClosureComparator.php

@@ -29,14 +29,16 @@ public function accepts($expected, $actual)
 
     public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = array())
     {
-        throw new ComparisonFailure(
-            $expected,
-            $actual,
-            // we don't need a diff
-            '',
-            '',
-            false,
-            'all closures are born different'
-        );
+        if ($expected !== $actual) {
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                // we don't need a diff
+                '',
+                '',
+                false,
+                'all closures are different if not identical'
+            );
+        }
     }
 }

tests/Argument/Token/ExactValueTokenTest.php

@@ -30,6 +30,16 @@ public function scores_10_for_objects_with_same_fields() {
 		self::assertEquals(10, $exactValueToken->scoreArgument($child2));
 	}
 
+    /**
+     * @test
+     */
+    public function scores_10_for_matching_callables() {
+        $callable = function() {};
+
+        $exactValueToken = new ExactValueToken($callable);
+        self::assertEquals(10, $exactValueToken->scoreArgument($callable));
+    }
+
 	/**
 	 * @test
 	 */
@@ -69,7 +79,6 @@ public function scores_false_for_object_and_null() {
 		$exactValueToken = new ExactValueToken($child1);
 		self::assertEquals(false, $exactValueToken->scoreArgument(null));
 	}
-
 }
 
 
@@ -93,4 +102,4 @@ public function __construct($name, $parent) {
 		$this->parent->addChild($this);
 	}
 
-}
+}