test enhancement

.travis.yml

@@ -1,12 +1,11 @@
-dist: trusty
 language: php
 
 php:
   - 7.1
   - 7.2
 
 install:
-  - composer install --prefer-dist
+  - composer install
 
 script:
   - vendor/bin/phpunit

composer.json

@@ -13,7 +13,7 @@
         "php": "^7.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.0"
+        "phpunit/phpunit": "^7.0"
     },
     "autoload": {
         "files": ["src/bootstrap.php"]

phpunit.xml.dist

@@ -18,7 +18,10 @@
 
     <filter>
         <whitelist>
-            <directory suffix=".php">./lib/</directory>
+            <directory suffix=".php">src</directory>
+            <exclude>
+                <file suffix=".php">src/bootstrap.php</file>
+            </exclude>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>

src/bootstrap.php

@@ -2,4 +2,6 @@
 
 require __DIR__ . '/iter.fn.php';
 require __DIR__ . '/iter.php';
-require __DIR__ . '/iter.rewindable.php';
+require __DIR__ . '/iter.rewindable.php';
+require __DIR__ . '/../test/MyIterator.php';
+require __DIR__ . '/../test/MyIteratorAgg.php';

test/MyIterator.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace iter;
+
+class MyIterator implements \Iterator {
+    private $position = 0;
+    private $array = [
+        "firstelement",
+        "secondelement",
+        "lastelement",
+    ];
+
+    public function __construct() {
+        $this->position = 0;
+    }
+
+    public function rewind() {
+        $this->position = 0;
+    }
+
+    public function current() {
+        return $this->array[$this->position];
+    }
+
+    public function key() {
+        return $this->position;
+    }
+
+    public function next() {
+        ++$this->position;
+    }
+
+    public function valid() {
+        return isset($this->array[$this->position]);
+    }
+}

test/MyIteratorAgg.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace iter;
+
+class MyIteratorAgg implements \IteratorAggregate {
+    public $property1 = "Public property one";
+    public $property2 = "Public property two";
+    public $property3 = "Public property three";
+
+    public function __construct() {
+        $this->property4 = "last property";
+    }
+
+    public function getIterator() {
+        return new \ArrayIterator($this);
+    }
+}

test/iterTest.php

@@ -359,6 +359,10 @@ public function testCount() {
         $this->assertSame(42, count(new _CountableTestDummy));
     }
 
+    public function testCountWithStringCount() {
+        $this->assertSame(3, count(new MyIterator()));
+    }
+
     public function testIsEmpty() {
         $this->assertTrue(isEmpty([]));
         $this->assertFalse(isEmpty([null]));
@@ -368,6 +372,10 @@ public function testIsEmpty() {
         $this->assertFalse(isEmpty(repeat(42)));
     }
 
+    public function testIsEmptyWithValidIteratorAgg() {
+        $this->assertFalse(isEmpty(new MyIteratorAgg()));
+    }
+
     public function testToArray() {
         $this->assertSame([1, 2, 3], toArray(['a' => 1, 'b' => 2, 'c' => 3]));
         $this->assertSame(