Implemented "Countable"

nozavroni · Nov 13, 2016 · b39d2a0 · b39d2a0
1 parent 9079304
commit b39d2a0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/src/CSVelte/Collection/AbstractCollection.php b/src/CSVelte/Collection/AbstractCollection.php
@@ -13,11 +13,13 @@
  */
 namespace CSVelte\Collection;
 
+use ArrayAccess;
+use Countable;
+use Iterator;
 use CSVelte\Contract\Collectable;
 use CSVelte\Collection\Collection as BaseCollection;
 use function CSVelte\is_traversable;
-use Iterator;
-use ArrayAccess;
+
 use OutOfBoundsException;
 
 /**
@@ -38,8 +40,9 @@
  *     it to return other formats if you want
  */
 abstract class AbstractCollection implements
-    Iterator,
-    ArrayAccess
+    ArrayAccess,
+    Countable,
+    Iterator
     /*Collectable*/
 {
     /**
@@ -89,8 +92,6 @@ public function __invoke($val = null, $index = null)
         }
     }
 
-    /** BEGIN Iterator methods */
-
     /** BEGIN ArrayAccess methods */
 
     /**
@@ -142,6 +143,17 @@ public function offsetUnset($offset)
 
     /** END ArrayAccess methods */
 
+    /** BEGIN Countable methods */
+
+    public function count()
+    {
+        return count($this->data);
+    }
+
+    /** END Countable methods */
+
+    /** BEGIN Iterator methods */
+
     /**
      * Return the current element.
      *

diff --git a/tests/CSVelte/Collection/CollectionTest.php b/tests/CSVelte/Collection/CollectionTest.php
@@ -14,6 +14,7 @@
 namespace CSVelteTest\Collection;
 
 use ArrayAccess;
+use Countable;
 use \Iterator;
 use \ArrayIterator;
 use CSVelte\Collection\AbstractCollection;
@@ -466,4 +467,16 @@ public function testOffsetMethodsForCollectionArrayAccess()
         $this->assertTrue(isset($coll['foo']));
         $this->assertEquals('var', $coll['foo']);
     }
+
+    public function testCollectionIsCountable()
+    {
+        $coll = Collection::factory($exp = [
+            'mk'     => 'lady',
+            'lorrie' => 'sweet',
+            'luke'   => 'really cool guy',
+            'terry'  => 'what a fool',
+        ]);
+        $this->assertInstanceOf(Countable::class, $coll);
+        $this->assertEquals(4, $coll->count());
+    }
 }