Skip to content

Commit dbb0ad4

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18486 from MauricioFauth/phpunit-attributes
Replace PHPUnit annotations with attributes
2 parents 4fc7322 + 3f2c53e commit dbb0ad4

377 files changed

Lines changed: 2688 additions & 2119 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎psalm-baseline.xml‎

Lines changed: 743 additions & 265 deletions
Large diffs are not rendered by default.

‎test/classes/Advisory/AdvisorTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66

77
use PhpMyAdmin\Advisory\Advisor;
88
use PhpMyAdmin\Tests\AbstractTestCase;
9+
use PHPUnit\Framework\Attributes\CoversClass;
10+
use PHPUnit\Framework\Attributes\DataProvider;
911
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
1012

11-
/** @covers \PhpMyAdmin\Advisory\Advisor */
13+
#[CoversClass(Advisor::class)]
1214
class AdvisorTest extends AbstractTestCase
1315
{
1416
protected function setUp(): void
@@ -26,9 +28,8 @@ protected function setUp(): void
2628
*
2729
* @param float $time time
2830
* @param string $expected expected result
29-
*
30-
* @dataProvider advisorTimes
3131
*/
32+
#[DataProvider('advisorTimes')]
3233
public function testAdvisorBytime(float $time, string $expected): void
3334
{
3435
$result = Advisor::byTime($time, 2);
@@ -53,9 +54,8 @@ public static function advisorTimes(): array
5354
* @param mixed[] $rule Rule to test
5455
* @param mixed[] $expected Expected rendered rule in fired/errors list
5556
* @param string|null $error Expected error string (null if none error expected)
56-
*
57-
* @dataProvider rulesProvider
5857
*/
58+
#[DataProvider('rulesProvider')]
5959
public function testAddRule(array $rule, array $expected, string|null $error): void
6060
{
6161
parent::setLanguage();

‎test/classes/Advisory/RulesTest.php‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,16 @@
55
namespace PhpMyAdmin\Tests\Advisory;
66

77
use PhpMyAdmin\Advisory\Rules;
8+
use PHPUnit\Framework\Attributes\CoversClass;
9+
use PHPUnit\Framework\Attributes\DataProvider;
810
use PHPUnit\Framework\TestCase;
911

10-
/**
11-
* @covers \PhpMyAdmin\Advisory\Rules
12-
* @psalm-import-type RuleType from Rules
13-
*/
12+
/** @psalm-import-type RuleType from Rules */
13+
#[CoversClass(Rules::class)]
1414
class RulesTest extends TestCase
1515
{
16-
/**
17-
* @psalm-param callable(): list<RuleType> $rulesFactory
18-
*
19-
* @dataProvider providerForTestRules
20-
*/
16+
/** @psalm-param callable(): list<RuleType> $rulesFactory */
17+
#[DataProvider('providerForTestRules')]
2118
public function testRules(callable $rulesFactory): void
2219
{
2320
$rules = $rulesFactory();

‎test/classes/BookmarkTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
use PhpMyAdmin\Identifiers\DatabaseName;
1111
use PhpMyAdmin\Identifiers\TableName;
1212
use PhpMyAdmin\Tests\Stubs\DbiDummy;
13+
use PHPUnit\Framework\Attributes\CoversClass;
1314

14-
/** @covers \PhpMyAdmin\Bookmark */
15+
#[CoversClass(Bookmark::class)]
1516
class BookmarkTest extends AbstractTestCase
1617
{
1718
protected DatabaseInterface $dbi;

‎test/classes/BrowseForeignersTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
use PhpMyAdmin\BrowseForeigners;
88
use PhpMyAdmin\Config;
99
use PhpMyAdmin\Template;
10+
use PHPUnit\Framework\Attributes\CoversClass;
1011

11-
/** @covers \PhpMyAdmin\BrowseForeigners */
12+
#[CoversClass(BrowseForeigners::class)]
1213
class BrowseForeignersTest extends AbstractTestCase
1314
{
1415
private BrowseForeigners $browseForeigners;

‎test/classes/CacheTest.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
namespace PhpMyAdmin\Tests;
66

77
use PhpMyAdmin\Cache;
8+
use PHPUnit\Framework\Attributes\CoversClass;
9+
use PHPUnit\Framework\Attributes\DataProvider;
810
use stdClass;
911

10-
/** @covers \PhpMyAdmin\Cache */
12+
#[CoversClass(Cache::class)]
1113
class CacheTest extends AbstractTestCase
1214
{
1315
public function setUp(): void
@@ -25,7 +27,7 @@ public static function dataProviderCacheKeyValues(): array
2527
];
2628
}
2729

28-
/** @dataProvider dataProviderCacheKeyValues */
30+
#[DataProvider('dataProviderCacheKeyValues')]
2931
public function testCacheHas(string $cacheKey, mixed $valueToCache): void
3032
{
3133
$this->assertFalse(Cache::has($cacheKey));
@@ -35,7 +37,7 @@ public function testCacheHas(string $cacheKey, mixed $valueToCache): void
3537
$this->assertFalse(Cache::has($cacheKey));
3638
}
3739

38-
/** @dataProvider dataProviderCacheKeyValues */
40+
#[DataProvider('dataProviderCacheKeyValues')]
3941
public function testCachePurge(string $cacheKey, mixed $valueToCache): void
4042
{
4143
$this->assertFalse(Cache::has($cacheKey));
@@ -45,15 +47,15 @@ public function testCachePurge(string $cacheKey, mixed $valueToCache): void
4547
$this->assertFalse(Cache::has($cacheKey));
4648
}
4749

48-
/** @dataProvider dataProviderCacheKeyValues */
50+
#[DataProvider('dataProviderCacheKeyValues')]
4951
public function testCacheSet(string $cacheKey, mixed $valueToCache): void
5052
{
5153
$this->assertFalse(Cache::has($cacheKey));
5254
Cache::set($cacheKey, $valueToCache);
5355
$this->assertTrue(Cache::has($cacheKey));
5456
}
5557

56-
/** @dataProvider dataProviderCacheKeyValues */
58+
#[DataProvider('dataProviderCacheKeyValues')]
5759
public function testCacheGet(string $cacheKey, mixed $valueToCache): void
5860
{
5961
$this->assertFalse(Cache::has($cacheKey));
@@ -62,7 +64,7 @@ public function testCacheGet(string $cacheKey, mixed $valueToCache): void
6264
$this->assertSame(Cache::get($cacheKey), $valueToCache);
6365
}
6466

65-
/** @dataProvider dataProviderCacheKeyValues */
67+
#[DataProvider('dataProviderCacheKeyValues')]
6668
public function testCacheGetDefaultValue(string $cacheKey, mixed $valueToCache): void
6769
{
6870
$this->assertFalse(Cache::has($cacheKey));
@@ -77,7 +79,7 @@ public function testCacheGetDefaultValue(string $cacheKey, mixed $valueToCache):
7779
$this->assertFalse(Cache::get($cacheKey, false));
7880
}
7981

80-
/** @dataProvider dataProviderCacheKeyValues */
82+
#[DataProvider('dataProviderCacheKeyValues')]
8183
public function testCacheRemove(string $cacheKey, mixed $valueToCache): void
8284
{
8385
$this->assertFalse(Cache::has($cacheKey));

‎test/classes/Charsets/CharsetTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66

77
use PhpMyAdmin\Charsets\Charset;
88
use PhpMyAdmin\Tests\AbstractTestCase;
9+
use PHPUnit\Framework\Attributes\CoversClass;
910

10-
/** @covers \PhpMyAdmin\Charsets\Charset */
11+
#[CoversClass(Charset::class)]
1112
class CharsetTest extends AbstractTestCase
1213
{
1314
public function testFromServer(): void

‎test/classes/Charsets/CollationTest.php‎

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

77
use PhpMyAdmin\Charsets\Collation;
88
use PhpMyAdmin\Tests\AbstractTestCase;
9+
use PHPUnit\Framework\Attributes\CoversClass;
10+
use PHPUnit\Framework\Attributes\DataProvider;
911

10-
/** @covers \PhpMyAdmin\Charsets\Collation */
12+
#[CoversClass(Collation::class)]
1113
class CollationTest extends AbstractTestCase
1214
{
1315
public function testFromServer(): void
@@ -40,9 +42,8 @@ public function testFromServer(): void
4042
*
4143
* @param string $collation Collation for which description is reqd
4244
* @param string $description Expected Description
43-
*
44-
* @dataProvider providerTestBuildDescription
4545
*/
46+
#[DataProvider('providerTestBuildDescription')]
4647
public function testBuildDescription(string $collation, string $description): void
4748
{
4849
$actual = Collation::fromServer(['Collation' => $collation]);

‎test/classes/CharsetsTest.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
namespace PhpMyAdmin\Tests;
66

77
use PhpMyAdmin\Charsets;
8+
use PHPUnit\Framework\Attributes\CoversClass;
9+
use PHPUnit\Framework\Attributes\PreserveGlobalState;
10+
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
811

9-
/**
10-
* @covers \PhpMyAdmin\Charsets
11-
* @runTestsInSeparateProcesses
12-
* @preserveGlobalState disabled
13-
*/
12+
#[CoversClass(Charsets::class)]
13+
#[PreserveGlobalState(false)]
14+
#[RunTestsInSeparateProcesses]
1415
class CharsetsTest extends AbstractTestCase
1516
{
1617
public function testGetServerCharset(): void

‎test/classes/CheckUserPrivilegesTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66

77
use PhpMyAdmin\CheckUserPrivileges;
88
use PhpMyAdmin\ShowGrants;
9+
use PHPUnit\Framework\Attributes\CoversClass;
910

10-
/** @covers \PhpMyAdmin\CheckUserPrivileges */
11+
#[CoversClass(CheckUserPrivileges::class)]
1112
class CheckUserPrivilegesTest extends AbstractTestCase
1213
{
1314
private CheckUserPrivileges $checkUserPrivileges;

0 commit comments

Comments
 (0)