php 8.1 compat

samsonasik · Apr 21, 2024 · 7b182f7 · 7b182f7
1 parent 8ab291b
commit 7b182f7
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 8 deletions.
diff --git a/src/AtLeast.php b/src/AtLeast.php
@@ -7,8 +7,6 @@
 use Traversable;
 use Webmozart\Assert\Assert;
 
-use function iterator_count;
-
 final class AtLeast
 {
     /**
@@ -50,7 +48,7 @@ private static function atLeastFoundTimes(
         // usage must be higher than 0
         Assert::greaterThan($maxCount, 0);
 
-        if (iterator_count($data) < $maxCount) {
+        if (Counter::count($data) < $maxCount) {
             return false;
         }
 

diff --git a/src/Only.php b/src/Only.php
@@ -7,8 +7,6 @@
 use Traversable;
 use Webmozart\Assert\Assert;
 
-use function iterator_count;
-
 final class Only
 {
     /**
@@ -50,7 +48,7 @@ private static function onlyFoundTimes(
         // usage must be higher than 0
         Assert::greaterThan($maxCount, 0);
 
-        if (iterator_count($data) < $maxCount) {
+        if (Counter::count($data) < $maxCount) {
             return false;
         }
 

diff --git a/tests/AtLeastTest.php b/tests/AtLeastTest.php
@@ -4,6 +4,7 @@
 
 namespace ArrayLookup\Tests;
 
+use ArrayIterator;
 use ArrayLookup\AtLeast;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -46,7 +47,7 @@ public static function onceDataProvider(): array
     }
 
     #[DataProvider('twiceDataProvider')]
-    public function testTwice(array $data, callable $filter, bool $expected): void
+    public function testTwice(iterable $data, callable $filter, bool $expected): void
     {
         $this->assertSame(
             $expected,
@@ -83,21 +84,41 @@ public static function twiceDataProvider(): array
                 static fn($datum): bool => $datum == 1,
                 false,
             ],
+            [
+                new ArrayIterator([1]),
+                static fn($datum): bool => $datum == 1,
+                false,
+            ],
             [
                 [1, "1"],
                 static fn($datum): bool => $datum == 1,
                 true,
             ],
+            [
+                new ArrayIterator([1, "1"]),
+                static fn($datum): bool => $datum == 1,
+                true,
+            ],
             [
                 [1, true],
                 static fn($datum): bool => $datum == 1,
                 true,
             ],
+            [
+                new ArrayIterator([1, true]),
+                static fn($datum): bool => $datum == 1,
+                true,
+            ],
             [
                 [1, true, "1"],
                 static fn($datum): bool => $datum == 1,
                 true,
             ],
+            [
+                new ArrayIterator([1, true, "1"]),
+                static fn($datum): bool => $datum == 1,
+                true,
+            ],
         ];
     }
 

diff --git a/tests/OnlyTest.php b/tests/OnlyTest.php
@@ -4,6 +4,7 @@
 
 namespace ArrayLookup\Tests;
 
+use ArrayIterator;
 use ArrayLookup\Only;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -49,7 +50,7 @@ public static function onceDataProvider(): array
 
     // phpcs:enable
     #[DataProvider('twiceDataProvider')]
-    public function testTwice(array $data, callable $filter, bool $expected): void
+    public function testTwice(iterable $data, callable $filter, bool $expected): void
     {
         $this->assertSame(
             $expected,
@@ -86,21 +87,41 @@ public static function twiceDataProvider(): array
                 static fn($datum): bool => $datum == 1,
                 false,
             ],
+            [
+                new ArrayIterator([1]),
+                static fn($datum): bool => $datum == 1,
+                false,
+            ],
             [
                 [1, "1"],
                 static fn($datum): bool => $datum == 1,
                 true,
             ],
+            [
+                new ArrayIterator([1, "1"]),
+                static fn($datum): bool => $datum == 1,
+                true,
+            ],
             [
                 [1, true],
                 static fn($datum): bool => $datum == 1,
                 true,
             ],
+            [
+                new ArrayIterator([1, true]),
+                static fn($datum): bool => $datum == 1,
+                true,
+            ],
             [
                 [1, true, "1"],
                 static fn($datum): bool => $datum == 1,
                 false,
             ],
+            [
+                new ArrayIterator([1, true, "1"]),
+                static fn($datum): bool => $datum == 1,
+                false,
+            ],
         ];
     }