Skip to content

Commit f533cef

Browse files
committed
Updated dependencies
1 parent 7f62959 commit f533cef

15 files changed

+92
-2
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
"squizlabs/php_codesniffer": "^3.13.2"
2020
},
2121
"require-dev": {
22-
"phing/phing": "3.0.1",
22+
"phing/phing": "3.0.1|3.1.0",
2323
"php-parallel-lint/php-parallel-lint": "1.4.0",
2424
"phpstan/phpstan": "2.1.19",
2525
"phpstan/phpstan-deprecation-rules": "2.0.3",
2626
"phpstan/phpstan-phpunit": "2.0.7",
2727
"phpstan/phpstan-strict-rules": "2.0.6",
28-
"phpunit/phpunit": "9.6.8|10.5.45|11.4.4|11.5.21|12.2.7"
28+
"phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.27|12.2.7"
2929
},
3030
"autoload": {
3131
"psr-4": {

tests/Helpers/ArrayHelperTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace SlevomatCodingStandard\Helpers;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use function array_key_exists;
67
use function count;
78
use function in_array;
@@ -16,6 +17,7 @@ class ArrayHelperTest extends TestCase
1617
* @dataProvider dataKeyValues
1718
* @param array{keyValues: array<int, array{content: string, indent?: string|null, key?: string|null, pointerArrow?: bool, pointerComma?: bool}>} $expect
1819
*/
20+
#[DataProvider('dataKeyValues')]
1921
public function testParse(string $file, int $arrayPointerNo, array $expect): void
2022
{
2123
$phpcsFile = $this->getCodeSnifferFile($file);
@@ -92,6 +94,7 @@ public function testParse(string $file, int $arrayPointerNo, array $expect): voi
9294
* @dataProvider dataKeyValues
9395
* @param array{indentation: string|null} $expect
9496
*/
97+
#[DataProvider('dataFlagsAndIndentation')]
9598
public function testGetIndentation(string $file, int $arrayPointerNo, array $expect): void
9699
{
97100
$phpcsFile = $this->getCodeSnifferFile($file);
@@ -108,6 +111,7 @@ public function testGetIndentation(string $file, int $arrayPointerNo, array $exp
108111
* @dataProvider dataKeyValues
109112
* @param array{flags: list<string>} $expect
110113
*/
114+
#[DataProvider('dataFlagsAndIndentation')]
111115
public function testIsKeyed(string $file, int $arrayPointerNo, array $expect): void
112116
{
113117
$phpcsFile = $this->getCodeSnifferFile($file);
@@ -124,6 +128,7 @@ public function testIsKeyed(string $file, int $arrayPointerNo, array $expect): v
124128
* @dataProvider dataKeyValues
125129
* @param array{flags: list<string>} $expect
126130
*/
131+
#[DataProvider('dataFlagsAndIndentation')]
127132
public function testIsKeyedAll(string $file, int $arrayPointerNo, array $expect): void
128133
{
129134
$phpcsFile = $this->getCodeSnifferFile($file);
@@ -140,6 +145,7 @@ public function testIsKeyedAll(string $file, int $arrayPointerNo, array $expect)
140145
* @dataProvider dataKeyValues
141146
* @param array{flags: list<string>} $expect
142147
*/
148+
#[DataProvider('dataFlagsAndIndentation')]
143149
public function testIsMultiLine(string $file, int $arrayPointerNo, array $expect): void
144150
{
145151
$phpcsFile = $this->getCodeSnifferFile($file);
@@ -154,6 +160,7 @@ public function testIsMultiLine(string $file, int $arrayPointerNo, array $expect
154160
* @dataProvider dataKeyValues
155161
* @param array{flags: list<string>} $expect
156162
*/
163+
#[DataProvider('dataFlagsAndIndentation')]
157164
public function testIsNotEmpty(string $file, int $arrayPointerNo, array $expect): void
158165
{
159166
$phpcsFile = $this->getCodeSnifferFile($file);
@@ -169,6 +176,7 @@ public function testIsNotEmpty(string $file, int $arrayPointerNo, array $expect)
169176
* @dataProvider dataKeyValues
170177
* @param array{flags: list<string>} $expect
171178
*/
179+
#[DataProvider('dataFlagsAndIndentation')]
172180
public function testIsSortedByKey(string $file, int $arrayPointerNo, array $expect): void
173181
{
174182
if (!in_array('keyed', $expect['flags'], true)) {
@@ -190,6 +198,7 @@ public function testIsSortedByKey(string $file, int $arrayPointerNo, array $expe
190198
* @dataProvider dataKeyValues
191199
* @param array{flags: list<string>} $expect
192200
*/
201+
#[DataProvider('dataFlagsAndIndentation')]
193202
public function testOpenClosePointers(string $file, int $arrayPointerNo, array $expect): void
194203
{
195204
$phpcsFile = $this->getCodeSnifferFile($file);

tests/Helpers/ConditionHelperTest.php

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

33
namespace SlevomatCodingStandard\Helpers;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use const T_IF;
67

78
class ConditionHelperTest extends TestCase
@@ -28,6 +29,7 @@ public static function dataConditionReturnsBoolean(): array
2829
/**
2930
* @dataProvider dataConditionReturnsBoolean
3031
*/
32+
#[DataProvider('dataConditionReturnsBoolean')]
3133
public function testConditionReturnsBoolean(int $line, bool $result): void
3234
{
3335
$phpcsFile = $this->getCodeSnifferFile(__DIR__ . '/data/conditions.php');

tests/Helpers/FunctionHelperTest.php

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

33
namespace SlevomatCodingStandard\Helpers;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use function array_map;
67
use function sprintf;
78
use const T_CLOSURE;
@@ -103,6 +104,7 @@ public static function dataParametersNames(): array
103104
* @dataProvider dataParametersNames
104105
* @param list<string> $expectedParametersNames
105106
*/
107+
#[DataProvider('dataParametersNames')]
106108
public function testParametersNames(string $functionName, array $expectedParametersNames): void
107109
{
108110
$phpcsFile = $this->getCodeSnifferFile(__DIR__ . '/data/functionParametersNames.php');
@@ -234,6 +236,7 @@ public static function dataParametersNullableTypeHints(): array
234236
* @dataProvider dataParametersTypeHints
235237
* @param array<string, TypeHint|null> $expectedParametersTypeHints
236238
*/
239+
#[DataProvider('dataParametersTypeHints')]
237240
public function testParametersTypeHints(string $functionName, array $expectedParametersTypeHints): void
238241
{
239242
$phpcsFile = $this->getCodeSnifferFile(__DIR__ . '/data/functionParametersTypeHints.php');
@@ -265,6 +268,7 @@ public function testParametersTypeHints(string $functionName, array $expectedPar
265268
* @dataProvider dataParametersNullableTypeHints
266269
* @param array<string, TypeHint|null> $expectedParametersTypeHints
267270
*/
271+
#[DataProvider('dataParametersNullableTypeHints')]
268272
public function testParametersNullableTypeHints(string $functionName, array $expectedParametersTypeHints): void
269273
{
270274
$phpcsFile = $this->getCodeSnifferFile(__DIR__ . '/data/functionParametersNullableTypeHints.php');
@@ -308,6 +312,7 @@ public static function dataFunctionReturnsValueOrNot(): array
308312
/**
309313
* @dataProvider dataFunctionReturnsValueOrNot
310314
*/
315+
#[DataProvider('dataFunctionReturnsValueOrNot')]
311316
public function testFunctionReturnsValueOrNot(string $functionName, bool $returnsValue): void
312317
{
313318
$phpcsFile = $this->getCodeSnifferFile(__DIR__ . '/data/functionReturnsValueOrNot.php');
@@ -333,6 +338,7 @@ public static function dataClosureReturnsValueOrNot(): array
333338
/**
334339
* @dataProvider dataClosureReturnsValueOrNot
335340
*/
341+
#[DataProvider('dataClosureReturnsValueOrNot')]
336342
public function testClosureReturnsValueOrNot(int $line, bool $returnsValue): void
337343
{
338344
$phpcsFile = $this->getCodeSnifferFile(__DIR__ . '/data/closureReturnsValueOrNot.php');

tests/Helpers/NamespaceHelperTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace SlevomatCodingStandard\Helpers;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use function sprintf;
67
use const T_STRING;
78

@@ -22,6 +23,7 @@ public static function dataIsFullyQualifiedName(): array
2223
/**
2324
* @dataProvider dataIsFullyQualifiedName
2425
*/
26+
#[DataProvider('dataIsFullyQualifiedName')]
2527
public function testIsFullyQualifiedName(string $typeName): void
2628
{
2729
self::assertTrue(NamespaceHelper::isFullyQualifiedName($typeName));
@@ -30,6 +32,7 @@ public function testIsFullyQualifiedName(string $typeName): void
3032
/**
3133
* @dataProvider dataIsFullyQualifiedName
3234
*/
35+
#[DataProvider('dataIsFullyQualifiedName')]
3336
public function testGetFullyQualifiedTypeNameUnchanged(string $typeName): void
3437
{
3538
self::assertSame($typeName, NamespaceHelper::getFullyQualifiedTypeName($typeName));
@@ -49,6 +52,7 @@ public static function dataIsNotFullyQualifiedName(): array
4952
/**
5053
* @dataProvider dataIsNotFullyQualifiedName
5154
*/
55+
#[DataProvider('dataIsNotFullyQualifiedName')]
5256
public function testIsNotFullyQualifiedName(string $typeName): void
5357
{
5458
self::assertFalse(NamespaceHelper::isFullyQualifiedName($typeName));
@@ -57,6 +61,7 @@ public function testIsNotFullyQualifiedName(string $typeName): void
5761
/**
5862
* @dataProvider dataIsNotFullyQualifiedName
5963
*/
64+
#[DataProvider('dataIsNotFullyQualifiedName')]
6065
public function testGetFullyQualifiedTypeNameChanged(string $typeName): void
6166
{
6267
self::assertSame(
@@ -79,6 +84,7 @@ public static function dataHasNamespace(): array
7984
/**
8085
* @dataProvider dataHasNamespace
8186
*/
87+
#[DataProvider('dataHasNamespace')]
8288
public function testHasNamespace(string $typeName): void
8389
{
8490
self::assertTrue(NamespaceHelper::hasNamespace($typeName));
@@ -98,6 +104,7 @@ public static function dataDoesNotHaveNamespace(): array
98104
/**
99105
* @dataProvider dataDoesNotHaveNamespace
100106
*/
107+
#[DataProvider('dataDoesNotHaveNamespace')]
101108
public function testDoesNotHaveNamespace(string $typeName): void
102109
{
103110
self::assertFalse(NamespaceHelper::hasNamespace($typeName));
@@ -132,6 +139,7 @@ public static function dataGetNameParts(): array
132139
* @dataProvider dataGetNameParts
133140
* @param list<string> $parts
134141
*/
142+
#[DataProvider('dataGetNameParts')]
135143
public function testGetNameParts(string $namespace, array $parts): void
136144
{
137145
self::assertSame($parts, NamespaceHelper::getNameParts($namespace));
@@ -217,6 +225,7 @@ public static function dataGetUnqualifiedNameFromFullyQualifiedName(): array
217225
/**
218226
* @dataProvider dataGetUnqualifiedNameFromFullyQualifiedName
219227
*/
228+
#[DataProvider('dataGetUnqualifiedNameFromFullyQualifiedName')]
220229
public function testGetUnqualifiedNameFromFullyQualifiedName(string $unqualifiedName, string $fullyQualifiedName): void
221230
{
222231
self::assertSame($unqualifiedName, NamespaceHelper::getUnqualifiedNameFromFullyQualifiedName($fullyQualifiedName));
@@ -237,6 +246,7 @@ public static function dataIsQualifiedName(): array
237246
/**
238247
* @dataProvider dataIsQualifiedName
239248
*/
249+
#[DataProvider('dataIsQualifiedName')]
240250
public function testIsQualifiedName(string $name): void
241251
{
242252
self::assertTrue(NamespaceHelper::isQualifiedName($name));
@@ -255,6 +265,7 @@ public static function dataIsNotQualifiedName(): array
255265
/**
256266
* @dataProvider dataIsNotQualifiedName
257267
*/
268+
#[DataProvider('dataIsNotQualifiedName')]
258269
public function testIsNotQualifiedName(string $name): void
259270
{
260271
self::assertFalse(NamespaceHelper::isQualifiedName($name));
@@ -288,6 +299,7 @@ public static function dataNormalizeToCanonicalName(): array
288299
/**
289300
* @dataProvider dataNormalizeToCanonicalName
290301
*/
302+
#[DataProvider('dataNormalizeToCanonicalName')]
291303
public function testNormalizeToCanonicalName(string $normalizedName, string $originalName): void
292304
{
293305
self::assertSame($normalizedName, NamespaceHelper::normalizeToCanonicalName($originalName));
@@ -321,6 +333,7 @@ public static function dataTypeIsInNamespace(): array
321333
/**
322334
* @dataProvider dataTypeIsInNamespace
323335
*/
336+
#[DataProvider('dataTypeIsInNamespace')]
324337
public function testTypeIsInNamespace(string $typeName, string $namespace): void
325338
{
326339
self::assertTrue(NamespaceHelper::isTypeInNamespace($typeName, $namespace));
@@ -362,6 +375,7 @@ public static function dataTypeIsNotInNamespace(): array
362375
/**
363376
* @dataProvider dataTypeIsNotInNamespace
364377
*/
378+
#[DataProvider('dataTypeIsNotInNamespace')]
365379
public function testTypeIsNotInNamespace(string $typeName, string $namespace): void
366380
{
367381
self::assertFalse(NamespaceHelper::isTypeInNamespace($typeName, $namespace));

tests/Helpers/PropertyHelperTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace SlevomatCodingStandard\Helpers;
44

55
use PHP_CodeSniffer\Files\File;
6+
use PHPUnit\Framework\Attributes\DataProvider;
67
use function sprintf;
78
use const T_VARIABLE;
89

@@ -139,6 +140,7 @@ public static function dataIsProperty(): array
139140
/**
140141
* @dataProvider dataIsProperty
141142
*/
143+
#[DataProvider('dataIsProperty')]
142144
public function testIsProperty(string $variableName, bool $isProperty): void
143145
{
144146
$phpcsFile = $this->getTestedCodeSnifferFile();
@@ -161,6 +163,7 @@ public static function dataIsPropertyIfPromoted(): array
161163
/**
162164
* @dataProvider dataIsPropertyIfPromoted
163165
*/
166+
#[DataProvider('dataIsPropertyIfPromoted')]
164167
public function testIsPropertyIfPromoted(string $variableName): void
165168
{
166169
$phpcsFile = $this->getTestedCodeSnifferFile();
@@ -281,6 +284,7 @@ public static function dataFindTypeHint(): array
281284
/**
282285
* @dataProvider dataFindTypeHint
283286
*/
287+
#[DataProvider('dataFindTypeHint')]
284288
public function testFindTypeHint(string $propertyName, ?string $typeHint, ?bool $isNullable): void
285289
{
286290
$phpcsFile = $this->getTestedCodeSnifferFile();

tests/Helpers/SniffSettingsHelperTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace SlevomatCodingStandard\Helpers;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
6+
57
class SniffSettingsHelperTest extends TestCase
68
{
79

@@ -66,6 +68,7 @@ public function testNormalizeAssociativeArrayWithIntegerKeys(): void
6668
* @dataProvider validRegularExpressionsProvider
6769
* @dataProvider invalidRegularExpressionsProvider
6870
*/
71+
#[DataProvider('validRegularExpressionsProvider')]
6972
public function testIsValidRegularExpression(string $expression, bool $valid): void
7073
{
7174
self::assertSame($valid, SniffSettingsHelper::isValidRegularExpression($expression));

tests/Helpers/StringHelperTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace SlevomatCodingStandard\Helpers;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
6+
57
class StringHelperTest extends TestCase
68
{
79

@@ -29,6 +31,7 @@ public static function dataStartsWith(): array
2931
/**
3032
* @dataProvider dataStartsWith
3133
*/
34+
#[DataProvider('dataStartsWith')]
3235
public function testStartsWith(string $haystack, string $needle): void
3336
{
3437
self::assertTrue(StringHelper::startsWith($haystack, $needle));
@@ -62,6 +65,7 @@ public static function dataNotStartsWith(): array
6265
/**
6366
* @dataProvider dataNotStartsWith
6467
*/
68+
#[DataProvider('dataNotStartsWith')]
6569
public function testNotStartsWith(string $haystack, string $needle): void
6670
{
6771
self::assertFalse(StringHelper::startsWith($haystack, $needle));
@@ -91,6 +95,7 @@ public static function dataEndsWith(): array
9195
/**
9296
* @dataProvider dataEndsWith
9397
*/
98+
#[DataProvider('dataEndsWith')]
9499
public function testEndsWith(string $haystack, string $needle): void
95100
{
96101
self::assertTrue(StringHelper::endsWith($haystack, $needle));
@@ -124,6 +129,7 @@ public static function dataNotEndsWith(): array
124129
/**
125130
* @dataProvider dataNotEndsWith
126131
*/
132+
#[DataProvider('dataNotEndsWith')]
127133
public function testNotEndsWith(string $haystack, string $needle): void
128134
{
129135
self::assertFalse(StringHelper::endsWith($haystack, $needle));

tests/Helpers/SuppressHelperTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace SlevomatCodingStandard\Helpers;
44

55
use PHP_CodeSniffer\Files\File;
6+
use PHPUnit\Framework\Attributes\DataProvider;
67

78
class SuppressHelperTest extends TestCase
89
{
@@ -94,6 +95,7 @@ public static function dataFunctionIsSuppressed(): array
9495
/**
9596
* @dataProvider dataFunctionIsSuppressed
9697
*/
98+
#[DataProvider('dataFunctionIsSuppressed')]
9799
public function testFunctionIsSuppressed(string $name): void
98100
{
99101
self::assertTrue(
@@ -120,6 +122,7 @@ public static function dataFunctionIsNotSuppressed(): array
120122
/**
121123
* @dataProvider dataFunctionIsNotSuppressed
122124
*/
125+
#[DataProvider('dataFunctionIsNotSuppressed')]
123126
public function testFunctionIsNotSuppressed(string $name): void
124127
{
125128
self::assertFalse(

0 commit comments

Comments
 (0)