Skip to content

Commit cbfb36d

Browse files
author
matt
committed
Switch phpunit annotations to attributes (thanks Rector!)
1 parent 71ef193 commit cbfb36d

17 files changed

+150
-154
lines changed

test/AbstractNormalizerTest.php

+12-19
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,24 @@
88
use Kynx\Code\Normalizer\AbstractNormalizer;
99
use Kynx\Code\Normalizer\NormalizerException;
1010
use Kynx\Code\Normalizer\NormalizerInterface;
11+
use Kynx\Code\Normalizer\PhpLabel;
1112
use Kynx\Code\Normalizer\WordCase;
13+
use PHPUnit\Framework\Attributes\CoversClass;
14+
use PHPUnit\Framework\Attributes\DataProvider;
15+
use PHPUnit\Framework\Attributes\UsesClass;
1216
use PHPUnit\Framework\TestCase;
1317

1418
use function version_compare;
1519

1620
use const PHP_VERSION;
1721

18-
/**
19-
* @uses \Kynx\Code\Normalizer\NormalizerException
20-
* @uses \Kynx\Code\Normalizer\PhpLabel
21-
* @uses \Kynx\Code\Normalizer\WordCase
22-
*
23-
* @covers \Kynx\Code\Normalizer\AbstractNormalizer
24-
*/
22+
#[CoversClass(AbstractNormalizer::class)]
23+
#[UsesClass(NormalizerException::class)]
24+
#[UsesClass(PhpLabel::class)]
25+
#[UsesClass(WordCase::class)]
2526
final class AbstractNormalizerTest extends TestCase
2627
{
27-
/**
28-
* @dataProvider labelProvider
29-
*/
28+
#[DataProvider('labelProvider')]
3029
public function testNormalize(string $label, string $expected): void
3130
{
3231
$actual = $this->getNormalizer()->normalize($label);
@@ -59,9 +58,7 @@ public static function labelProvider(): array
5958
];
6059
}
6160

62-
/**
63-
* @dataProvider caseProvider
64-
*/
61+
#[DataProvider('caseProvider')]
6562
public function testNormalizeUsesCase(WordCase $case, string $expected): void
6663
{
6764
$actual = $this->getNormalizer($case)->normalize('foo bar');
@@ -81,9 +78,7 @@ public static function caseProvider(): array
8178
];
8279
}
8380

84-
/**
85-
* @dataProvider spellOutCaseProvider
86-
*/
81+
#[DataProvider('spellOutCaseProvider')]
8782
public function testSpellOutCase(WordCase $case, string $label, string $expected): void
8883
{
8984
$actual = $this->getNormalizer($case)->normalize($label);
@@ -151,9 +146,7 @@ public function testPrepareSuffixAllowsNullAndAssertionErrorThrown(): void
151146
$normalizer->normalize('class');
152147
}
153148

154-
/**
155-
* @dataProvider invalidSuffixProvider
156-
*/
149+
#[DataProvider('invalidSuffixProvider')]
157150
public function testPrepareSuffixInvalidThrowsException(string $suffix): void
158151
{
159152
self::expectException(NormalizerException::class);

test/AbstractUniqueLabelerTest.php

+11-7
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,30 @@
44

55
namespace KynxTest\Code\Normalizer;
66

7+
use Kynx\Code\Normalizer\AbstractNormalizer;
78
use Kynx\Code\Normalizer\AbstractUniqueLabeler;
89
use Kynx\Code\Normalizer\PropertyNameNormalizer;
910
use Kynx\Code\Normalizer\UniqueStrategy\NumberSuffix;
11+
use Kynx\Code\Normalizer\WordCase;
12+
use PHPUnit\Framework\Attributes\CoversClass;
13+
use PHPUnit\Framework\Attributes\DataProvider;
14+
use PHPUnit\Framework\Attributes\UsesClass;
1015
use PHPUnit\Framework\TestCase;
1116

1217
/**
13-
* @uses \Kynx\Code\Normalizer\AbstractNormalizer
14-
* @uses \Kynx\Code\Normalizer\PropertyNameNormalizer
15-
* @uses \Kynx\Code\Normalizer\UniqueStrategy\NumberSuffix
16-
* @uses \Kynx\Code\Normalizer\WordCase
17-
*
18-
* @covers \Kynx\Code\Normalizer\AbstractUniqueLabeler
1918
* @psalm-suppress InternalMethod
2019
*/
20+
#[CoversClass(AbstractUniqueLabeler::class)]
21+
#[UsesClass(AbstractNormalizer::class)]
22+
#[UsesClass(PropertyNameNormalizer::class)]
23+
#[UsesClass(NumberSuffix::class)]
24+
#[UsesClass(WordCase::class)]
2125
final class AbstractUniqueLabelerTest extends TestCase
2226
{
2327
/**
24-
* @dataProvider labelProvider
2528
* @param list<string> $labels
2629
*/
30+
#[DataProvider('labelProvider')]
2731
public function testGetUnique(array $labels, bool $caseSensitive, array $expected): void
2832
{
2933
$namer = new class (

test/ClassConstantNameNormalizerTest.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66

77
use Kynx\Code\Normalizer\ClassConstantNameNormalizer;
88
use Kynx\Code\Normalizer\WordCase;
9+
use PHPUnit\Framework\Attributes\CoversClass;
10+
use PHPUnit\Framework\Attributes\DataProvider;
911
use PHPUnit\Framework\TestCase;
1012

11-
/**
12-
* @covers \Kynx\Code\Normalizer\ClassConstantNameNormalizer
13-
*/
13+
#[CoversClass(ClassConstantNameNormalizer::class)]
1414
final class ClassConstantNameNormalizerTest extends TestCase
1515
{
16-
/**
17-
* @dataProvider constantNameProvider
18-
*/
16+
#[DataProvider('constantNameProvider')]
1917
public function testNormalize(string $constantName, WordCase $case, string $expected): void
2018
{
2119
$normalizer = new ClassConstantNameNormalizer('RESERVED', $case);

test/ClassNameNormalizerTest.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44

55
namespace KynxTest\Code\Normalizer;
66

7+
use Kynx\Code\Normalizer\AbstractNormalizer;
78
use Kynx\Code\Normalizer\ClassNameNormalizer;
9+
use Kynx\Code\Normalizer\PhpLabel;
810
use Kynx\Code\Normalizer\WordCase;
11+
use PHPUnit\Framework\Attributes\CoversClass;
12+
use PHPUnit\Framework\Attributes\DataProvider;
13+
use PHPUnit\Framework\Attributes\UsesClass;
914
use PHPUnit\Framework\TestCase;
1015

11-
/**
12-
* @uses \Kynx\Code\Normalizer\AbstractNormalizer
13-
* @uses \Kynx\Code\Normalizer\PhpLabel
14-
* @uses \Kynx\Code\Normalizer\WordCase
15-
*
16-
* @covers \Kynx\Code\Normalizer\ClassNameNormalizer
17-
*/
16+
#[CoversClass(ClassNameNormalizer::class)]
17+
#[UsesClass(AbstractNormalizer::class)]
18+
#[UsesClass(PhpLabel::class)]
19+
#[UsesClass(WordCase::class)]
1820
final class ClassNameNormalizerTest extends TestCase
1921
{
20-
/**
21-
* @dataProvider classNameProvider
22-
*/
22+
#[DataProvider('classNameProvider')]
2323
public function testNormalize(string $className, WordCase $case, string $expected): void
2424
{
2525
$normalizer = new ClassNameNormalizer('Reserved', $case);

test/ConstantNameNormalizerTest.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44

55
namespace KynxTest\Code\Normalizer;
66

7+
use Kynx\Code\Normalizer\AbstractNormalizer;
78
use Kynx\Code\Normalizer\ConstantNameNormalizer;
9+
use Kynx\Code\Normalizer\PhpLabel;
810
use Kynx\Code\Normalizer\WordCase;
11+
use PHPUnit\Framework\Attributes\CoversClass;
12+
use PHPUnit\Framework\Attributes\DataProvider;
13+
use PHPUnit\Framework\Attributes\UsesClass;
914
use PHPUnit\Framework\TestCase;
1015

11-
/**
12-
* @uses \Kynx\Code\Normalizer\AbstractNormalizer
13-
* @uses \Kynx\Code\Normalizer\PhpLabel
14-
* @uses \Kynx\Code\Normalizer\WordCase
15-
*
16-
* @covers \Kynx\Code\Normalizer\ConstantNameNormalizer
17-
*/
16+
#[CoversClass(ConstantNameNormalizer::class)]
17+
#[UsesClass(AbstractNormalizer::class)]
18+
#[UsesClass(PhpLabel::class)]
19+
#[UsesClass(WordCase::class)]
1820
final class ConstantNameNormalizerTest extends TestCase
1921
{
20-
/**
21-
* @dataProvider constantNameProvider
22-
*/
22+
#[DataProvider('constantNameProvider')]
2323
public function testNormalize(string $constantName, WordCase $case, string $expected): void
2424
{
2525
$normalizer = new ConstantNameNormalizer('RESERVED', $case);

test/NormalizerExceptionTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
namespace KynxTest\Code\Normalizer;
66

77
use Kynx\Code\Normalizer\NormalizerException;
8+
use PHPUnit\Framework\Attributes\CoversClass;
89
use PHPUnit\Framework\TestCase;
910

10-
/**
11-
* @covers \Kynx\Code\Normalizer\NormalizerException
12-
*/
11+
#[CoversClass(NormalizerException::class)]
1312
final class NormalizerExceptionTest extends TestCase
1413
{
1514
public function testTransliterationFailureWithErrorString(): void

test/PhpLabelTest.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@
55
namespace KynxTest\Code\Normalizer;
66

77
use Kynx\Code\Normalizer\PhpLabel;
8+
use PHPUnit\Framework\Attributes\CoversClass;
9+
use PHPUnit\Framework\Attributes\DataProvider;
810
use PHPUnit\Framework\TestCase;
911

10-
/**
11-
* @covers \Kynx\Code\Normalizer\PhpLabel
12-
*/
12+
#[CoversClass(PhpLabel::class)]
1313
final class PhpLabelTest extends TestCase
1414
{
15-
/**
16-
* @dataProvider isValidProvider
17-
*/
15+
#[DataProvider('isValidProvider')]
1816
public function testIsValid(PhpLabel $label, string $string, bool $expected): void
1917
{
2018
$actual = $label->isValid($string);

test/PropertyNameNormalizerTest.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44

55
namespace KynxTest\Code\Normalizer;
66

7+
use Kynx\Code\Normalizer\AbstractNormalizer;
8+
use Kynx\Code\Normalizer\PhpLabel;
79
use Kynx\Code\Normalizer\PropertyNameNormalizer;
810
use Kynx\Code\Normalizer\WordCase;
11+
use PHPUnit\Framework\Attributes\CoversClass;
12+
use PHPUnit\Framework\Attributes\DataProvider;
13+
use PHPUnit\Framework\Attributes\UsesClass;
914
use PHPUnit\Framework\TestCase;
1015

11-
/**
12-
* @uses \Kynx\Code\Normalizer\AbstractNormalizer
13-
* @uses \Kynx\Code\Normalizer\PhpLabel
14-
* @uses \Kynx\Code\Normalizer\WordCase
15-
*
16-
* @covers \Kynx\Code\Normalizer\PropertyNameNormalizer
17-
*/
16+
#[CoversClass(PropertyNameNormalizer::class)]
17+
#[UsesClass(AbstractNormalizer::class)]
18+
#[UsesClass(PhpLabel::class)]
19+
#[UsesClass(WordCase::class)]
1820
final class PropertyNameNormalizerTest extends TestCase
1921
{
20-
/**
21-
* @dataProvider propertyNameProvider
22-
*/
22+
#[DataProvider('propertyNameProvider')]
2323
public function testNormalizePropertyName(string $propertyName, WordCase $case, string $expected): void
2424
{
2525
$normalizer = new PropertyNameNormalizer($case);

test/UniqueClassConstantLabelerTest.php

+13-10
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@
44

55
namespace KynxTest\Code\Normalizer;
66

7+
use Kynx\Code\Normalizer\AbstractNormalizer;
8+
use Kynx\Code\Normalizer\AbstractUniqueLabeler;
79
use Kynx\Code\Normalizer\ClassConstantNameNormalizer;
10+
use Kynx\Code\Normalizer\PhpLabel;
811
use Kynx\Code\Normalizer\UniqueClassConstantLabeler;
12+
use Kynx\Code\Normalizer\UniqueConstantLabeler;
913
use Kynx\Code\Normalizer\UniqueStrategy\NumberSuffix;
1014
use Kynx\Code\Normalizer\WordCase;
15+
use PHPUnit\Framework\Attributes\CoversClass;
16+
use PHPUnit\Framework\Attributes\UsesClass;
1117
use PHPUnit\Framework\TestCase;
1218

13-
/**
14-
* @uses \Kynx\Code\Normalizer\AbstractNormalizer
15-
* @uses \Kynx\Code\Normalizer\AbstractUniqueLabeler
16-
* @uses \Kynx\Code\Normalizer\ClassConstantNameNormalizer
17-
* @uses \Kynx\Code\Normalizer\UniqueStrategy\NumberSuffix
18-
* @uses \Kynx\Code\Normalizer\PhpLabel
19-
* @uses \Kynx\Code\Normalizer\WordCase
20-
*
21-
* @covers \Kynx\Code\Normalizer\UniqueConstantLabeler
22-
*/
19+
#[CoversClass(UniqueConstantLabeler::class)]
20+
#[UsesClass(AbstractNormalizer::class)]
21+
#[UsesClass(AbstractUniqueLabeler::class)]
22+
#[UsesClass(ClassConstantNameNormalizer::class)]
23+
#[UsesClass(NumberSuffix::class)]
24+
#[UsesClass(PhpLabel::class)]
25+
#[UsesClass(WordCase::class)]
2326
final class UniqueClassConstantLabelerTest extends TestCase
2427
{
2528
public function testConstructorSetsCaseSensitive(): void

test/UniqueClassLabelerTest.php

+13-10
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@
44

55
namespace KynxTest\Code\Normalizer;
66

7+
use Kynx\Code\Normalizer\AbstractNormalizer;
8+
use Kynx\Code\Normalizer\AbstractUniqueLabeler;
79
use Kynx\Code\Normalizer\ClassNameNormalizer;
10+
use Kynx\Code\Normalizer\PhpLabel;
811
use Kynx\Code\Normalizer\UniqueClassLabeler;
912
use Kynx\Code\Normalizer\UniqueStrategy\NumberSuffix;
13+
use Kynx\Code\Normalizer\WordCase;
14+
use PHPUnit\Framework\Attributes\CoversClass;
15+
use PHPUnit\Framework\Attributes\UsesClass;
1016
use PHPUnit\Framework\TestCase;
1117

12-
/**
13-
* @uses \Kynx\Code\Normalizer\AbstractNormalizer
14-
* @uses \Kynx\Code\Normalizer\AbstractUniqueLabeler
15-
* @uses \Kynx\Code\Normalizer\ClassNameNormalizer
16-
* @uses \Kynx\Code\Normalizer\PhpLabel
17-
* @uses \Kynx\Code\Normalizer\UniqueStrategy\NumberSuffix
18-
* @uses \Kynx\Code\Normalizer\WordCase
19-
*
20-
* @covers \Kynx\Code\Normalizer\UniqueClassLabeler
21-
*/
18+
#[CoversClass(UniqueClassLabeler::class)]
19+
#[UsesClass(AbstractNormalizer::class)]
20+
#[UsesClass(AbstractUniqueLabeler::class)]
21+
#[UsesClass(ClassNameNormalizer::class)]
22+
#[UsesClass(PhpLabel::class)]
23+
#[UsesClass(NumberSuffix::class)]
24+
#[UsesClass(WordCase::class)]
2225
final class UniqueClassLabelerTest extends TestCase
2326
{
2427
public function testConstructorSetsCaseInsensitive(): void

test/UniqueConstantLabelerTest.php

+12-10
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,24 @@
44

55
namespace KynxTest\Code\Normalizer;
66

7+
use Kynx\Code\Normalizer\AbstractNormalizer;
8+
use Kynx\Code\Normalizer\AbstractUniqueLabeler;
79
use Kynx\Code\Normalizer\ConstantNameNormalizer;
10+
use Kynx\Code\Normalizer\PhpLabel;
811
use Kynx\Code\Normalizer\UniqueConstantLabeler;
912
use Kynx\Code\Normalizer\UniqueStrategy\NumberSuffix;
1013
use Kynx\Code\Normalizer\WordCase;
14+
use PHPUnit\Framework\Attributes\CoversClass;
15+
use PHPUnit\Framework\Attributes\UsesClass;
1116
use PHPUnit\Framework\TestCase;
1217

13-
/**
14-
* @uses \Kynx\Code\Normalizer\AbstractNormalizer
15-
* @uses \Kynx\Code\Normalizer\AbstractUniqueLabeler
16-
* @uses \Kynx\Code\Normalizer\ConstantNameNormalizer
17-
* @uses \Kynx\Code\Normalizer\UniqueStrategy\NumberSuffix
18-
* @uses \Kynx\Code\Normalizer\PhpLabel
19-
* @uses \Kynx\Code\Normalizer\WordCase
20-
*
21-
* @covers \Kynx\Code\Normalizer\UniqueConstantLabeler
22-
*/
18+
#[CoversClass(UniqueConstantLabeler::class)]
19+
#[UsesClass(AbstractNormalizer::class)]
20+
#[UsesClass(AbstractUniqueLabeler::class)]
21+
#[UsesClass(ConstantNameNormalizer::class)]
22+
#[UsesClass(NumberSuffix::class)]
23+
#[UsesClass(PhpLabel::class)]
24+
#[UsesClass(WordCase::class)]
2325
final class UniqueConstantLabelerTest extends TestCase
2426
{
2527
public function testConstructorSetsCaseSensitive(): void

test/UniquePropertyLabelerTest.php

+11-9
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,22 @@
44

55
namespace KynxTest\Code\Normalizer;
66

7+
use Kynx\Code\Normalizer\AbstractNormalizer;
8+
use Kynx\Code\Normalizer\AbstractUniqueLabeler;
79
use Kynx\Code\Normalizer\PropertyNameNormalizer;
810
use Kynx\Code\Normalizer\UniquePropertyLabeler;
911
use Kynx\Code\Normalizer\UniqueStrategy\NumberSuffix;
12+
use Kynx\Code\Normalizer\WordCase;
13+
use PHPUnit\Framework\Attributes\CoversClass;
14+
use PHPUnit\Framework\Attributes\UsesClass;
1015
use PHPUnit\Framework\TestCase;
1116

12-
/**
13-
* @uses \Kynx\Code\Normalizer\AbstractNormalizer
14-
* @uses \Kynx\Code\Normalizer\AbstractUniqueLabeler
15-
* @uses \Kynx\Code\Normalizer\PropertyNameNormalizer
16-
* @uses \Kynx\Code\Normalizer\UniqueStrategy\NumberSuffix
17-
* @uses \Kynx\Code\Normalizer\WordCase
18-
*
19-
* @covers \Kynx\Code\Normalizer\UniquePropertyLabeler
20-
*/
17+
#[CoversClass(UniquePropertyLabeler::class)]
18+
#[UsesClass(AbstractNormalizer::class)]
19+
#[UsesClass(AbstractUniqueLabeler::class)]
20+
#[UsesClass(PropertyNameNormalizer::class)]
21+
#[UsesClass(NumberSuffix::class)]
22+
#[UsesClass(WordCase::class)]
2123
final class UniquePropertyLabelerTest extends TestCase
2224
{
2325
public function testConstructorSetsCaseSensitive(): void

0 commit comments

Comments
 (0)