Revert array_map

Author: GromNaN

tests/Builder/Stage/ProjectStageTest.php

@@ -75,11 +75,31 @@ public function testIncludeComputedFields(): void
             Stage::project(
                 title: 1,
                 isbn: object(
-                    prefix: Expression::substr(Expression::stringFieldPath('isbn'), 0, 3),
-                    group: Expression::substr(Expression::stringFieldPath('isbn'), 3, 2),
-                    publisher: Expression::substr(Expression::stringFieldPath('isbn'), 5, 4),
-                    title: Expression::substr(Expression::stringFieldPath('isbn'), 9, 3),
-                    checkDigit: Expression::substr(Expression::stringFieldPath('isbn'), 12, 1),
+                    prefix: Expression::substr(
+                        Expression::stringFieldPath('isbn'),
+                        0,
+                        3,
+                    ),
+                    group: Expression::substr(
+                        Expression::stringFieldPath('isbn'),
+                        3,
+                        2,
+                    ),
+                    publisher: Expression::substr(
+                        Expression::stringFieldPath('isbn'),
+                        5,
+                        4,
+                    ),
+                    title: Expression::substr(
+                        Expression::stringFieldPath('isbn'),
+                        9,
+                        3,
+                    ),
+                    checkDigit: Expression::substr(
+                        Expression::stringFieldPath('isbn'),
+                        12,
+                        1,
+                    ),
                 ),
                 lastName: Expression::stringFieldPath('author.last'),
                 copiesSold: Expression::intFieldPath('copies'),
@@ -119,7 +139,10 @@ public function testProjectNewArrayFields(): void
     {
         $pipeline = new Pipeline(
             Stage::project(
-                myArray: [Expression::fieldPath('x'), Expression::fieldPath('y')],
+                myArray: [
+                    Expression::fieldPath('x'),
+                    Expression::fieldPath('y'),
+                ],
             ),
         );
 

tests/Builder/Stage/UnionWithStageTest.php

@@ -10,10 +10,7 @@
 use MongoDB\Builder\Stage;
 use MongoDB\Tests\Builder\PipelineTestCase;
 
-use function array_map;
-use function array_merge;
 use function MongoDB\object;
-use function range;
 
 /**
  * Test $unionWith stage
@@ -22,33 +19,42 @@ class UnionWithStageTest extends PipelineTestCase
 {
     public function testReport1AllSalesByYearAndStoresAndItems(): void
     {
-        $pipeline = new Pipeline(...array_merge(
-            [
-                Stage::set(
-                    _id: '2017',
+        $pipeline = new Pipeline(
+            Stage::set(
+                _id: '2017',
+            ),
+            Stage::unionWith(
+                coll: 'sales_2018',
+                pipeline: new Pipeline(
+                    Stage::set(
+                        _id: '2018',
+                    ),
                 ),
-            ],
-            array_map(
-                fn ($year) => Stage::unionWith(
-                    coll: 'sales_' . $year,
-                    pipeline: new Pipeline(
-                        Stage::set(
-                            _id: (string) $year,
-                        ),
+            ),
+            Stage::unionWith(
+                coll: 'sales_2019',
+                pipeline: new Pipeline(
+                    Stage::set(
+                        _id: '2019',
                     ),
                 ),
-                range(2018, 2020),
             ),
-            [
-                Stage::sort(
-                    object(
-                        _id: 1,
-                        store: 1,
-                        item: 1,
+            Stage::unionWith(
+                coll: 'sales_2020',
+                pipeline: new Pipeline(
+                    Stage::set(
+                        _id: '2020',
                     ),
                 ),
-            ],
-        ));
+            ),
+            Stage::sort(
+                object(
+                    _id: 1,
+                    store: 1,
+                    item: 1,
+                ),
+            ),
+        );
 
         $this->assertSamePipeline(Pipelines::UnionWithReport1AllSalesByYearAndStoresAndItems, $pipeline);
     }