Skip to content

Commit bacfebe

Browse files
authored
Fix set names in LaravelSetProvider (#344)
1 parent 1e17a0b commit bacfebe

File tree

2 files changed

+32
-19
lines changed

2 files changed

+32
-19
lines changed

src/Set/LaravelSetProvider.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,20 @@ private function getLaravelVersions(): array
111111
{
112112
$versions = [];
113113

114+
$totalPostFive = count(self::LARAVEL_POST_FIVE);
114115
foreach (self::LARAVEL_POST_FIVE as $index => $version) {
115116
$versions[] = new Set(
116117
self::GROUP_NAME,
117-
'Laravel Framework ' . ($index + 6) . '.0',
118+
'Laravel Framework ' . ($totalPostFive - $index + 5) . '.0',
118119
$version,
119120
);
120121
}
121122

123+
$totalFive = count(self::LARAVEL_FIVE);
122124
foreach (self::LARAVEL_FIVE as $index => $version) {
123125
$versions[] = new Set(
124126
self::GROUP_NAME,
125-
'Laravel Framework 5.' . $index,
127+
'Laravel Framework 5.' . ($totalFive - $index - 1),
126128
$version,
127129
);
128130
}

tests/Sets/LaravelSetProviderTest.php

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@
1111
final class LaravelSetProviderTest extends TestCase
1212
{
1313
private const array LARAVEL_VERSION_SETS = [
14-
LaravelSetList::LARAVEL_50,
15-
LaravelSetList::LARAVEL_51,
16-
LaravelSetList::LARAVEL_52,
17-
LaravelSetList::LARAVEL_53,
18-
LaravelSetList::LARAVEL_54,
19-
LaravelSetList::LARAVEL_55,
20-
LaravelSetList::LARAVEL_56,
21-
LaravelSetList::LARAVEL_57,
22-
LaravelSetList::LARAVEL_58,
23-
LaravelSetList::LARAVEL_60,
24-
LaravelSetList::LARAVEL_70,
25-
LaravelSetList::LARAVEL_80,
26-
LaravelSetList::LARAVEL_90,
27-
LaravelSetList::LARAVEL_100,
28-
LaravelSetList::LARAVEL_110,
14+
'Laravel Framework 12.0' => LaravelSetList::LARAVEL_120,
15+
'Laravel Framework 11.0' => LaravelSetList::LARAVEL_110,
16+
'Laravel Framework 10.0' => LaravelSetList::LARAVEL_100,
17+
'Laravel Framework 9.0' => LaravelSetList::LARAVEL_90,
18+
'Laravel Framework 8.0' => LaravelSetList::LARAVEL_80,
19+
'Laravel Framework 7.0' => LaravelSetList::LARAVEL_70,
20+
'Laravel Framework 6.0' => LaravelSetList::LARAVEL_60,
21+
'Laravel Framework 5.8' => LaravelSetList::LARAVEL_58,
22+
'Laravel Framework 5.7' => LaravelSetList::LARAVEL_57,
23+
'Laravel Framework 5.6' => LaravelSetList::LARAVEL_56,
24+
'Laravel Framework 5.5' => LaravelSetList::LARAVEL_55,
25+
'Laravel Framework 5.4' => LaravelSetList::LARAVEL_54,
26+
'Laravel Framework 5.3' => LaravelSetList::LARAVEL_53,
27+
'Laravel Framework 5.2' => LaravelSetList::LARAVEL_52,
28+
'Laravel Framework 5.1' => LaravelSetList::LARAVEL_51,
29+
'Laravel Framework 5.0' => LaravelSetList::LARAVEL_50,
2930
];
3031

3132
/**
@@ -64,14 +65,24 @@ public function it_provides_all_laravel_versions(): void
6465

6566
$sets = $laravelSetProvider->provide();
6667

67-
$sets = array_filter(
68+
$filePaths = array_filter(
6869
array_map(
6970
fn (SetInterface $set) => $set->getSetFilePath(),
7071
$sets
7172
),
7273
fn (string $filePath) => in_array($filePath, self::LARAVEL_VERSION_SETS, true),
7374
);
7475

75-
Assert::assertCount(count(self::LARAVEL_VERSION_SETS), $sets);
76+
Assert::assertSame(array_values(self::LARAVEL_VERSION_SETS), array_values($filePaths));
77+
78+
$setNames = array_filter(
79+
array_map(
80+
fn (SetInterface $set) => $set->getName(),
81+
$sets
82+
),
83+
fn (string $setName) => in_array($setName, array_keys(self::LARAVEL_VERSION_SETS), true),
84+
);
85+
86+
Assert::assertSame(array_keys(self::LARAVEL_VERSION_SETS), array_values($setNames));
7687
}
7788
}

0 commit comments

Comments
 (0)