replacing recursive data merging in dataProvider with generator (#7959)

matomo-org · Dec 20, 2024 · 37578a0 · 37578a0
1 parent c844d7d
commit 37578a0
Showing 1 changed file with 12 additions and 21 deletions.
diff --git a/Tests/DeviceDetectorTest.php b/Tests/DeviceDetectorTest.php
@@ -247,9 +247,8 @@ public function testParse(array $fixtureData): void
         $this->assertEquals($fixtureData, $uaInfo, $errorMessage);
     }
 
-    public function getFixtures(): array
+    public function getFixtures(): \Generator
     {
-        $fixtures     = [];
         $fixtureFiles = \glob(\realpath(__DIR__) . '/fixtures/*.yml');
 
         foreach ($fixtureFiles as $fixturesPath) {
@@ -260,12 +259,10 @@ public function getFixtures(): array
                 continue;
             }
 
-            $fixtures = \array_merge(\array_map(static function ($elem) {
-                return [$elem];
-            }, $typeFixtures), $fixtures);
+            foreach ($typeFixtures as $fixture) {
+                yield [$fixture];
+            }
         }
-
-        return $fixtures;
     }
 
     /**
@@ -301,20 +298,17 @@ public function testParseClient(array $fixtureData): void
         $this->assertEquals($fixtureData['client'], $uaInfo['client'], $messageError);
     }
 
-    public function getFixturesClient(): array
+    public function getFixturesClient(): \Generator
     {
-        $fixtures     = [];
         $fixtureFiles = \glob(\realpath(__DIR__) . '/Parser/Client/fixtures/*.yml');
 
         foreach ($fixtureFiles as $fixturesPath) {
             $typeFixtures = \Spyc::YAMLLoad($fixturesPath);
 
-            $fixtures = \array_merge(\array_map(static function ($elem) {
-                return [$elem];
-            }, $typeFixtures), $fixtures);
+            foreach ($typeFixtures as $fixture) {
+                yield [$fixture];
+            }
         }
-
-        return $fixtures;
     }
 
     /**
@@ -341,20 +335,17 @@ public function testParseDevice(array $fixtureData): void
         $this->assertEquals($fixtureData['device'], $uaInfo['device']);
     }
 
-    public function getFixturesDevice(): array
+    public function getFixturesDevice(): \Generator
     {
-        $fixtures     = [];
         $fixtureFiles = \glob(\realpath(__DIR__) . '/Parser/Device/fixtures/*.yml');
 
         foreach ($fixtureFiles as $fixturesPath) {
             $typeFixtures = \Spyc::YAMLLoad($fixturesPath);
 
-            $fixtures = \array_merge(\array_map(static function ($elem) {
-                return [$elem];
-            }, $typeFixtures), $fixtures);
+            foreach ($typeFixtures as $fixture) {
+                yield [$fixture];
+            }
         }
-
-        return $fixtures;
     }
 
     public function getFixturesDeviceTypeFromClientHints(): array