Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replacing recursive data merging in dataProvider with generator #7959

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Replacing recursive data merging in dataProvider with generator #7959

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions Tests/DeviceDetectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
}

/**
Expand Down Expand Up @@ -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;
}

/**
Expand All @@ -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
Expand Down
Loading