Skip to content

Commit 6ca493c

Browse files
mbrodalambrodala
committed
[TASK] Migrate to PHPUnit attributes
1 parent 7758368 commit 6ca493c

File tree

6 files changed

+26
-40
lines changed

6 files changed

+26
-40
lines changed

‎Tests/Functional/Hook/DataHandler/AddRedirectTest.php‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace Pagemachine\FlatUrls\Tests\Functional\Hook\DataHandler;
66

7+
use PHPUnit\Framework\Attributes\DataProvider;
8+
use PHPUnit\Framework\Attributes\Test;
79
use TYPO3\CMS\Core\Configuration\SiteConfiguration;
810
use TYPO3\CMS\Core\Configuration\SiteWriter;
911
use TYPO3\CMS\Core\Database\ConnectionPool;
@@ -25,10 +27,8 @@ final class AddRedirectTest extends FunctionalTestCase
2527
'pagemachine/typo3-flat-urls',
2628
];
2729

28-
/**
29-
* @test
30-
* @dataProvider redirectPages
31-
*/
30+
#[Test]
31+
#[DataProvider('redirectPages')]
3232
public function addsRedirectsOnSlugChange(array $pages, array $changes, array $expected): void
3333
{
3434
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
@@ -150,9 +150,7 @@ public static function redirectPages(): \Generator
150150
];
151151
}
152152

153-
/**
154-
* @test
155-
*/
153+
#[Test]
156154
public function skipsPagesWithoutSite(): void
157155
{
158156
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
@@ -185,9 +183,7 @@ public function skipsPagesWithoutSite(): void
185183
self::assertEquals(0, $redirectConnection->count('*', 'sys_redirect', []));
186184
}
187185

188-
/**
189-
* @test
190-
*/
186+
#[Test]
191187
public function skipsInactivePages(): void
192188
{
193189
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');

‎Tests/Functional/Hook/DataHandler/AmendSlugTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace Pagemachine\FlatUrls\Tests\Functional\Hook\DataHandler;
66

7+
use PHPUnit\Framework\Attributes\DataProvider;
8+
use PHPUnit\Framework\Attributes\Test;
79
use TYPO3\CMS\Core\Database\ConnectionPool;
810
use TYPO3\CMS\Core\DataHandling\DataHandler;
911
use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
@@ -24,10 +26,8 @@ final class AmendSlugTest extends FunctionalTestCase
2426
'pagemachine/typo3-flat-urls',
2527
];
2628

27-
/**
28-
* @test
29-
* @dataProvider pages
30-
*/
29+
#[Test]
30+
#[DataProvider('pages')]
3131
public function ensuresFlatUrls(array $changes, int $pageUid, string $expected): void
3232
{
3333
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');

‎Tests/Functional/Hook/DataHandler/RefreshSlugTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace Pagemachine\FlatUrls\Tests\Functional\Hook\DataHandler;
66

7+
use PHPUnit\Framework\Attributes\DataProvider;
8+
use PHPUnit\Framework\Attributes\Test;
79
use TYPO3\CMS\Core\Database\ConnectionPool;
810
use TYPO3\CMS\Core\DataHandling\DataHandler;
911
use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
@@ -23,10 +25,8 @@ final class RefreshSlugTest extends FunctionalTestCase
2325
'pagemachine/typo3-flat-urls',
2426
];
2527

26-
/**
27-
* @test
28-
* @dataProvider pages
29-
*/
28+
#[Test]
29+
#[DataProvider('pages')]
3030
public function ensuresFlatUrls(array $pages, array $changes, int $pageUid, string $expected): void
3131
{
3232
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');

‎Tests/Functional/Hook/DataHandler/ResolveRedirectConflictTest.php‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Pagemachine\FlatUrls\Tests\Functional\Hook\DataHandler;
66

7+
use PHPUnit\Framework\Attributes\Test;
78
use TYPO3\CMS\Core\Cache\CacheManager;
89
use TYPO3\CMS\Core\Configuration\SiteConfiguration;
910
use TYPO3\CMS\Core\Configuration\SiteWriter;
@@ -26,9 +27,7 @@ final class ResolveRedirectConflictTest extends FunctionalTestCase
2627
'pagemachine/typo3-flat-urls',
2728
];
2829

29-
/**
30-
* @test
31-
*/
30+
#[Test]
3231
public function resolvesPagePathRedirectConflicts(): void
3332
{
3433
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
@@ -106,9 +105,7 @@ public function resolvesPagePathRedirectConflicts(): void
106105
self::assertSame('t3://page?uid=2', $redirects[1]['target'] ?? null);
107106
}
108107

109-
/**
110-
* @test
111-
*/
108+
#[Test]
112109
public function normalizesPagePath(): void
113110
{
114111
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
@@ -189,9 +186,7 @@ public function normalizesPagePath(): void
189186
self::assertSame('t3://page?uid=2', $redirects[0]['target'] ?? null);
190187
}
191188

192-
/**
193-
* @test
194-
*/
189+
#[Test]
195190
public function resolvesUidRedirectConflicts(): void
196191
{
197192
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
@@ -230,9 +225,7 @@ public function resolvesUidRedirectConflicts(): void
230225
self::assertEquals(0, $redirectConnection->count('*', 'sys_redirect', []));
231226
}
232227

233-
/**
234-
* @test
235-
*/
228+
#[Test]
236229
public function skipsPagesWithoutSite(): void
237230
{
238231
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
@@ -264,9 +257,7 @@ public function skipsPagesWithoutSite(): void
264257
self::assertEquals(0, $redirectConnection->count('*', 'sys_redirect', []));
265258
}
266259

267-
/**
268-
* @test
269-
*/
260+
#[Test]
270261
public function skipsInactivePages(): void
271262
{
272263
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');

‎Tests/Functional/Page/PageCollectionTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use Pagemachine\FlatUrls\Page\Page;
88
use Pagemachine\FlatUrls\Page\PageCollection;
9+
use PHPUnit\Framework\Attributes\Test;
910
use TYPO3\CMS\Core\Database\ConnectionPool;
1011
use TYPO3\CMS\Core\Utility\GeneralUtility;
1112
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
@@ -23,9 +24,7 @@ final class PageCollectionTest extends FunctionalTestCase
2324
'pagemachine/typo3-flat-urls',
2425
];
2526

26-
/**
27-
* @test
28-
*/
27+
#[Test]
2928
public function collectsAllPages(): void
3029
{
3130
$connection = GeneralUtility::makeInstance(ConnectionPool::class)

‎Tests/Functional/Page/Slug/PageSlugProcessorTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
use Pagemachine\FlatUrls\Page\Page;
88
use Pagemachine\FlatUrls\Page\Slug\PageSlugProcessor;
9+
use PHPUnit\Framework\Attributes\DataProvider;
10+
use PHPUnit\Framework\Attributes\Test;
911
use TYPO3\CMS\Core\Database\ConnectionPool;
1012
use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
1113
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -24,10 +26,8 @@ final class PageSlugProcessorTest extends FunctionalTestCase
2426
'pagemachine/typo3-flat-urls',
2527
];
2628

27-
/**
28-
* @test
29-
* @dataProvider pages
30-
*/
29+
#[Test]
30+
#[DataProvider('pages')]
3131
public function updatesPageSlugs(array $pages, int $pageUid, string $expected): void
3232
{
3333
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');

0 commit comments

Comments
 (0)