No need filter on loop when total data is < target total filtered data

samsonasik · Apr 21, 2024 · 7d600ee · 7d600ee
1 parent d71ac82
commit 7d600ee
Show file tree

Hide file tree

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

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

diff --git a/tests/AtLeastTest.php b/tests/AtLeastTest.php
@@ -78,6 +78,11 @@ public static function twiceDataProvider(): array
                 static fn(string $datum, int $key): bool => $datum !== 'abc' && $key > 1,
                 false
             ],
+            [
+                [1],
+                static fn($datum): bool => $datum == 1,
+                false,
+            ],
         ];
     }
 

diff --git a/tests/OnlyTest.php b/tests/OnlyTest.php
@@ -81,6 +81,11 @@ public static function twiceDataProvider(): array
                 static fn(string $datum, int $key): bool => $datum !== 'abc' && $key > 1,
                 false
             ],
+            [
+                [1],
+                static fn($datum): bool => $datum == 1,
+                false,
+            ],
         ];
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,6 +78,11 @@ public static function twiceDataProvider(): array @@
                     static fn(string $datum, int $key): bool => $datum !== 'abc' && $key > 1,
                     false
                 ],
+                [
+                    [1],
+                    static fn($datum): bool => $datum == 1,
+                    false,
+                ],
             ];
         }
@@ Expand Down @@