Merge pull request beberlei#43 from fritsjanb/assert_countable_test

Add Assertion::count test for \Countable

Author: beberlei

lib/Assert/Assertion.php

@@ -947,10 +947,10 @@ static public function __callStatic($method, $args)
     /**
      * Assert that the count of countable is equal to count.
      *
-     * @param mixed  $countable
-     * @param int    $count
-     * @param string $message
-     * @param string $propertyPath
+     * @param array|\Countable $countable
+     * @param int              $count
+     * @param string           $message
+     * @param string           $propertyPath
      * @return void
      * @throws \Assert\AssertionFailedException
      */

tests/Assert/Tests/AssertTest.php

@@ -821,16 +821,36 @@ public function testAllWithNoValueThrows()
     public function testValidCount()
     {
         Assertion::count(array('Hi'), 1);
+        Assertion::count(new OneCountable(), 1);
     }
 
-    public function testInvalidCount()
+    public static function dataInvalidCount()
+    {
+        return array(
+            array(array('Hi', 'There'), 3),
+            array(new OneCountable(), 2),
+        );
+    }
+
+    /**
+     * @dataProvider dataInvalidCount
+     */
+    public function testInvalidCount($countable, $count)
     {
         $this->setExpectedException('Assert\AssertionFailedException', null, Assertion::INVALID_COUNT);
-        Assertion::count(array('Hi', 'there'), 1);
+        Assertion::count($countable, $count);
     }
 }
 
 class ChildStdClass extends \stdClass
 {
 
 }
+
+class OneCountable implements \Countable
+{
+    public function count()
+    {
+        return 1;
+    }
+}