Skip to content

Commit 224f5d7

Browse files
OcramiusOcramius
authored
Merge pull request #160 from IonBazan/tests/static-providers
[Tests][Refactor] Use static data providers
2 parents 84532c3 + 32c39d9 commit 224f5d7

File tree

9 files changed

+34
-34
lines changed

9 files changed

+34
-34
lines changed

‎test/Generator/EnumGeneratorTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function testGenerateValidEnums(array $options, string $expected): void
4444
* 1: non-empty-string
4545
* }>
4646
*/
47-
public function validOptionSpecifications(): iterable
47+
public static function validOptionSpecifications(): iterable
4848
{
4949
yield 'pure enum without namespace' => [
5050
[
@@ -155,7 +155,7 @@ public function testReflectionEnumWorks(string $enumClass, string $expected): vo
155155
* 1: non-empty-string
156156
* }>
157157
*/
158-
public function validEnumSpecifications(): iterable
158+
public static function validEnumSpecifications(): iterable
159159
{
160160
yield 'pure enum reflection' => [
161161
'TestNamespace\\Environment',

‎test/Generator/MethodGeneratorTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ public function testCreateFromArrayWithReturnsReference($value, $expected): void
339339
* bool
340340
* }>
341341
*/
342-
public function returnsReferenceValues(): array
342+
public static function returnsReferenceValues(): array
343343
{
344344
return [
345345
[true, true],
@@ -432,7 +432,7 @@ public function testFrom($className, $methodName, $expectedReturnSignature)
432432
* @return string[][]
433433
* @psalm-return list<array{class-string, non-empty-string, non-empty-string}>
434434
*/
435-
public function returnTypeHintClasses()
435+
public static function returnTypeHintClasses()
436436
{
437437
return [
438438
[ReturnTypeHintedClass::class, 'voidReturn', 'void'],
@@ -523,7 +523,7 @@ public function testGeneratedReturnTypeForPhp80ReturnType(
523523
/**
524524
* @psalm-return non-empty-list<array{class-string, non-empty-string, non-empty-string, non-empty-string}>
525525
*/
526-
public function php80Methods(): array
526+
public static function php80Methods(): array
527527
{
528528
return [
529529
[Php80Types::class, 'mixedType', 'mixed', 'mixed'],

‎test/Generator/ParameterGeneratorTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public function testFromReflectionGenerate($methodName, $expectedCode)
175175
* @return string[][]
176176
* @psalm-return non-empty-list<array{non-empty-string, non-empty-string}>
177177
*/
178-
public function dataFromReflectionGenerate(): array
178+
public static function dataFromReflectionGenerate(): array
179179
{
180180
return [
181181
['name', '$param'],
@@ -305,7 +305,7 @@ public function testGeneratesSimpleHints($type, $expectedType)
305305
/**
306306
* @return string[][]
307307
*/
308-
public function simpleHints()
308+
public static function simpleHints()
309309
{
310310
return [
311311
['callable', 'callable'],
@@ -347,7 +347,7 @@ public function testTypeHintWithValidClassName($className)
347347
/**
348348
* @return string[][]
349349
*/
350-
public function validClassName()
350+
public static function validClassName()
351351
{
352352
return [
353353
['stdClass'],
@@ -416,7 +416,7 @@ public function testTypeHintFromReflectionGeneratedCode($className, $methodName,
416416
/**
417417
* @return string[][]
418418
*/
419-
public function reflectionHints()
419+
public static function reflectionHints()
420420
{
421421
$parameters = [
422422
[InternalHintsClass::class, 'arrayParameter', 'foo', 'array'],
@@ -512,7 +512,7 @@ public function testVariadicArgumentFromReflection(
512512
/**
513513
* @return string[][]
514514
*/
515-
public function variadicHints()
515+
public static function variadicHints()
516516
{
517517
return [
518518
[VariadicParametersClass::class, 'firstVariadicParameter', 'foo', '... $foo'],
@@ -627,7 +627,7 @@ public function testGeneratedSignatureForPhp80ParameterType(
627627
/**
628628
* @psalm-return non-empty-list<array{class-string, non-empty-string, positive-int|0, string, non-empty-string}>
629629
*/
630-
public function php80Methods(): array
630+
public static function php80Methods(): array
631631
{
632632
return [
633633
[Php80Types::class, 'mixedType', 0, 'mixed', 'mixed $parameter'],

‎test/Generator/PropertyGeneratorTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testPropertyConstructor(): void
3838
/**
3939
* @return bool[][]|string[][]|int[][]|null[][]
4040
*/
41-
public function dataSetTypeSetValueGenerate(): array
41+
public static function dataSetTypeSetValueGenerate(): array
4242
{
4343
return [
4444
['string', 'foo', "'foo';"],
@@ -122,7 +122,7 @@ public function testPropertyMultilineValue(): void
122122
self::assertSame($expectedSource, $targetSource);
123123
}
124124

125-
public function visibility(): Generator
125+
public static function visibility(): Generator
126126
{
127127
yield 'public' => [PropertyGenerator::FLAG_PUBLIC, 'public'];
128128
yield 'protected' => [PropertyGenerator::FLAG_PROTECTED, 'protected'];

‎test/Generator/TypeGeneratorTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function testRejectsInvalidTypeString($typeString)
7373
* is that this library still supports generating code that is compatible with PHP 7,
7474
* and therefore we cannot normalize nullable types to use `|null`, for now.
7575
*/
76-
public function validType()
76+
public static function validType()
7777
{
7878
$valid = [
7979
['\\foo', '\\foo'],
@@ -249,7 +249,7 @@ public function validClassName()
249249
/**
250250
* @return string[][]
251251
*/
252-
public function invalidType()
252+
public static function invalidType()
253253
{
254254
$invalid = [
255255
[''],

‎test/Generator/ValueGeneratorTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testAllowedPossibleConstantsType($constants): void
6060
* @return object[][]
6161
* @psalm-return array<class-string, array{SplArrayObject|StdlibArrayObject}>
6262
*/
63-
public function constantsType(): array
63+
public static function constantsType(): array
6464
{
6565
return [
6666
SplArrayObject::class => [new SplArrayObject()],
@@ -84,7 +84,7 @@ public function testValidConstantTypes(PropertyValueGenerator $generator, $expec
8484
* @return array
8585
* @psalm-return non-empty-list<array{PropertyValueGenerator, non-empty-string}>
8686
*/
87-
public function validConstantTypes(): array
87+
public static function validConstantTypes(): array
8888
{
8989
return [
9090
[
@@ -127,7 +127,7 @@ public function validConstantTypes(): array
127127
* @param array $value
128128
* @return array
129129
*/
130-
protected function generateArrayData($longOutput, array $value)
130+
protected static function generateArrayData($longOutput, array $value)
131131
{
132132
$shortOutput = str_replace(
133133
['array(', ')'],
@@ -164,7 +164,7 @@ protected function generateArrayData($longOutput, array $value)
164164
*
165165
* @return array
166166
*/
167-
public function simpleArray()
167+
public static function simpleArray()
168168
{
169169
$value = ['foo'];
170170

@@ -174,15 +174,15 @@ public function simpleArray()
174174
)
175175
EOS;
176176

177-
return $this->generateArrayData($longOutput, $value);
177+
return self::generateArrayData($longOutput, $value);
178178
}
179179

180180
/**
181181
* Data provider for testPropertyDefaultValueCanHandleComplexArrayOfTypes test
182182
*
183183
* @return array
184184
*/
185-
public function complexArray()
185+
public static function complexArray()
186186
{
187187
$value = [
188188
5,
@@ -222,13 +222,13 @@ public function complexArray()
222222
)
223223
EOS;
224224

225-
return $this->generateArrayData($longOutput, $value);
225+
return self::generateArrayData($longOutput, $value);
226226
}
227227

228228
/**
229229
* Data provider for testPropertyDefaultValueCanHandleComplexArrayWCustomIndentOfTypes test
230230
*/
231-
public function complexArrayWCustomIndent(): array
231+
public static function complexArrayWCustomIndent(): array
232232
{
233233
$value = [
234234
'5bcf08a0a5d20' => [
@@ -302,15 +302,15 @@ public function complexArrayWCustomIndent(): array
302302
)
303303
EOS;
304304

305-
return $this->generateArrayData($longOutput, $value);
305+
return self::generateArrayData($longOutput, $value);
306306
}
307307

308308
/**
309309
* Data provider for testPropertyDefaultValueCanHandleArrayWithUnsortedKeys test
310310
*
311311
* @return array
312312
*/
313-
public function unsortedKeysArray()
313+
public static function unsortedKeysArray()
314314
{
315315
$value = [
316316
1 => 'a',
@@ -330,7 +330,7 @@ public function unsortedKeysArray()
330330
)
331331
EOS;
332332

333-
return $this->generateArrayData($longOutput, $value);
333+
return self::generateArrayData($longOutput, $value);
334334
}
335335

336336
/**
@@ -467,7 +467,7 @@ public function testEscaping($input, $expectedEscapedValue)
467467
*
468468
* @return string[][]
469469
*/
470-
public function getEscapedParameters()
470+
public static function getEscapedParameters()
471471
{
472472
return [
473473
['\\', '\\\\'],
@@ -476,7 +476,7 @@ public function getEscapedParameters()
476476
];
477477
}
478478

479-
public function invalidValue(): Generator
479+
public static function invalidValue(): Generator
480480
{
481481
yield 'object' => [new DateTime(), DateTime::class];
482482
yield 'resource' => [fopen('php://input', 'r'), 'resource (stream)'];

‎test/Reflection/DocBlock/Tag/VarTagTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function testParse(
2727
$this->assertSame($expectedDescription, $tag->getDescription());
2828
}
2929

30-
public function varTagProvider(): array
30+
public static function varTagProvider(): array
3131
{
3232
return [
3333
'only type' => [

‎test/Reflection/ParameterReflectionTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function testCallableTypeHint()
8686
* @return string[][]
8787
* @psalm-return non-empty-list<array{non-empty-string, non-empty-string}>
8888
*/
89-
public function paramType(): array
89+
public static function paramType(): array
9090
{
9191
return [
9292
['one', 'int'],
@@ -101,7 +101,7 @@ public function paramType(): array
101101
* @return string[][]
102102
* @psalm-return non-empty-list<array{non-empty-string, non-empty-string}>
103103
*/
104-
public function paramTypeWithNotAllParamsDeclared(): array
104+
public static function paramTypeWithNotAllParamsDeclared(): array
105105
{
106106
return [
107107
['one', 'string'],
@@ -159,7 +159,7 @@ public function testDetectType($className, $methodName, $parameterName, $expecte
159159
/**
160160
* @return string[][]
161161
*/
162-
public function reflectionHints()
162+
public static function reflectionHints()
163163
{
164164
return [
165165
[InternalHintsClass::class, 'arrayParameter', 'foo', 'array'],
@@ -214,7 +214,7 @@ public function testDetectTypeWithDocBlockOnlyTypes($className, $methodName, $pa
214214
/**
215215
* @return string[][]
216216
*/
217-
public function docBlockHints()
217+
public static function docBlockHints()
218218
{
219219
return [
220220
[DocBlockOnlyHintsClass::class, 'arrayParameter', 'foo', 'array'],

‎test/Reflection/ReflectionDocBlockTagTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public function testPropertyVarDoc(
161161
self::assertSame($expectedDescription, $varTag->getDescription());
162162
}
163163

164-
public function propertyVarDocProvider(): array
164+
public static function propertyVarDocProvider(): array
165165
{
166166
return [
167167
'only type' => ['onlyType', ['string'], null, null],

0 commit comments

Comments
 (0)