fix: Empty Traversable in randomElements() (#605)

* fix: Empty `Traversable` in `randomElements()` * Fix: Remove *unmatched* `ignoreErrors` due to code changes.
FakerPHP · Apr 2, 2023 · feb1640 · feb1640
1 parent abf5e11
commit feb1640
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -648,11 +648,6 @@ parameters:
 			count: 1
 			path: src/Faker/Provider/Base.php
 
-		-
-			message: "#^Ternary operator condition is always false\\.$#"
-			count: 1
-			path: src/Faker/Provider/Base.php
-
 		-
 			message: "#^Unreachable statement \\- code above always terminates\\.$#"
 			count: 1

diff --git a/src/Faker/Provider/Base.php b/src/Faker/Provider/Base.php
@@ -190,15 +190,15 @@ public static function randomAscii()
     public static function randomElements($array = ['a', 'b', 'c'], $count = 1, $allowDuplicates = false)
     {
         $traversables = [];
+        $arr = $array;
 
         if ($array instanceof \Traversable) {
             foreach ($array as $element) {
                 $traversables[] = $element;
             }
+            $arr = $traversables;
         }
 
-        $arr = count($traversables) ? $traversables : $array;
-
         $allKeys = array_keys($arr);
         $numKeys = count($allKeys);
 

diff --git a/test/Faker/Provider/BaseTest.php b/test/Faker/Provider/BaseTest.php
@@ -556,6 +556,10 @@ public function testRandomElements(): void
         self::assertIsArray($empty);
         self::assertCount(0, $empty);
 
+        $emptyTraversable = BaseProvider::randomElements(new \ArrayIterator(), 0);
+        self::assertIsArray($emptyTraversable);
+        self::assertCount(0, $emptyTraversable);
+
         $shuffled = BaseProvider::randomElements(['foo', 'bar', 'baz'], 3);
         self::assertContains('foo', $shuffled);
         self::assertContains('bar', $shuffled);