feat(Data): New behavior for DataZip: if the providers have different lengths, the resulting data sets will be as many as the shortest provider.

Author: roxblnfk

src/Data/DataZip.php

@@ -13,7 +13,7 @@
  * Zips multiple data providers together.
  *
  * Each data set will contain one value from each provider, combined into an array.
- * If the providers have different lengths, `null` will be used for missing values.
+ * If the providers have different lengths, the resulting data sets will be as many as the shortest provider.
  *
  * @api
  */

src/Data/Internal/DataProviderInterceptor.php

@@ -225,23 +225,16 @@ static function () use ($info, $providerAttr) {
         );
 
         dataset:
-        $allFinished = true;
         $dataSet = [];
         $key = [];
         foreach ($generators as $gen) {
-            if ($gen->valid()) {
-                $allFinished = false;
-                $dataSet[] = $gen->current();
-                $key[] = $gen->key();
-                $gen->next();
-            } else {
-                $key[] = '';
-                $dataSet[] = null;
+            if (!$gen->valid()) {
+                return;
             }
-        }
 
-        if ($allFinished) {
-            return;
+            $dataSet[] = $gen->current();
+            $key[] = $gen->key();
+            $gen->next();
         }
 
         yield \implode(self::KEY_SEPARATOR_ZIP, $key) => \array_merge(...$dataSet);

tests/Data/Self/DataZip.php

@@ -19,6 +19,12 @@ public static function numbersProvider(): array
         ];
     }
 
+    public static function aFewLettersProvider(): iterable
+    {
+        yield 'ab' => ['a', 'b'];
+        yield 'cd' => ['c', 'd'];
+    }
+
     public static function lettersProvider(): iterable
     {
         yield 'ab' => ['a', 'b'];
@@ -39,4 +45,17 @@ public function sum(int $a, int $b, string $c, string $d): void
             [5, 6, 'e', 'f'],
         ], true));
     }
+
+    #[Test]
+    #[\Testo\Data\DataZip(
+        new DataProvider('numbersProvider'),
+        new DataProvider('aFewLettersProvider'),
+    )]
+    public function sumFew(int $a, int $b, string $c, string $d): void
+    {
+        Assert::true(\in_array([$a, $b, $c, $d], [
+            [1, 2, 'a', 'b'],
+            [3, 4, 'c', 'd'],
+        ], true));
+    }
 }