Skip to content

Commit 9569a83

Browse files
aadmathijssenaadmathijssen
authored
Mark all data providers as static (#163)
Reasons: - consistency: some data providers were already static, now all of them are static - performance: the class does not need to be instantiated anymore to execute the data provider - future-proof: non-static data providers are deprecated in PHPUnit 10 Co-authored-by: Aad Mathijssen <[email protected]>
1 parent 420071a commit 9569a83

7 files changed

+40
-40
lines changed

‎tests/ComparatorTest.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function testCompare($version1, $operator, $version2, $expected)
128128
/**
129129
* @return array<mixed>
130130
*/
131-
public function greaterThanProvider()
131+
public static function greaterThanProvider()
132132
{
133133
return array(
134134
array('1.25.0', '1.24.0', true),
@@ -143,7 +143,7 @@ public function greaterThanProvider()
143143
/**
144144
* @return array<mixed>
145145
*/
146-
public function greaterThanOrEqualToProvider()
146+
public static function greaterThanOrEqualToProvider()
147147
{
148148
return array(
149149
array('1.25.0', '1.24.0', true),
@@ -155,7 +155,7 @@ public function greaterThanOrEqualToProvider()
155155
/**
156156
* @return array<mixed>
157157
*/
158-
public function lessThanProvider()
158+
public static function lessThanProvider()
159159
{
160160
return array(
161161
array('1.25.0', '1.24.0', false),
@@ -171,7 +171,7 @@ public function lessThanProvider()
171171
/**
172172
* @return array<mixed>
173173
*/
174-
public function lessThanOrEqualToProvider()
174+
public static function lessThanOrEqualToProvider()
175175
{
176176
return array(
177177
array('1.25.0', '1.24.0', false),
@@ -183,7 +183,7 @@ public function lessThanOrEqualToProvider()
183183
/**
184184
* @return array<mixed>
185185
*/
186-
public function equalToProvider()
186+
public static function equalToProvider()
187187
{
188188
return array(
189189
array('1.25.0', '1.24.0', false),
@@ -198,7 +198,7 @@ public function equalToProvider()
198198
/**
199199
* @return array<mixed>
200200
*/
201-
public function notEqualToProvider()
201+
public static function notEqualToProvider()
202202
{
203203
return array(
204204
array('1.25.0', '1.24.0', true),
@@ -210,7 +210,7 @@ public function notEqualToProvider()
210210
/**
211211
* @return array<mixed>
212212
*/
213-
public function compareProvider()
213+
public static function compareProvider()
214214
{
215215
return array(
216216
array('1.25.0', '>', '1.24.0', true),

‎tests/Constraint/ConstraintTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ public function testInvalidOperators($version, $operator, $expected)
438438
/**
439439
* @return array<mixed>
440440
*/
441-
public function invalidOperators()
441+
public static function invalidOperators()
442442
{
443443
return array(
444444
array('1.2.3', 'invalid', 'InvalidArgumentException'),
@@ -466,7 +466,7 @@ public function testBounds($operator, $normalizedVersion, Bound $expectedLower,
466466
/**
467467
* @return array<mixed>
468468
*/
469-
public function bounds()
469+
public static function bounds()
470470
{
471471
return array(
472472
'equal to 1.0.0.0' => array('==', '1.0.0.0', new Bound('1.0.0.0', true), new Bound('1.0.0.0', true)),
@@ -535,7 +535,7 @@ public function testCompile($requireOperator, $requireVersion, $provideOperator,
535535
/**
536536
* @return array<mixed>
537537
*/
538-
public function matrix()
538+
public static function matrix()
539539
{
540540
$versions = array('1.0', '2.0', 'dev-master', 'dev-foo', '3.0-b2', '3.0-beta2');
541541
$operators = array('==', '!=', '>', '<', '>=', '<=');

‎tests/Constraint/MultiConstraintTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public function testBounds(array $constraints, $conjunctive, Bound $expectedLowe
154154
/**
155155
* @return array<mixed>
156156
*/
157-
public function bounds()
157+
public static function bounds()
158158
{
159159
return array(
160160
'all equal' => array(
@@ -226,7 +226,7 @@ public function testBoundsIntegrationWithVersionParser($constraints, Bound $expe
226226
/**
227227
* @return array<mixed>
228228
*/
229-
public function boundsIntegration()
229+
public static function boundsIntegration()
230230
{
231231
return array(
232232
'^7.0' => array(
@@ -321,7 +321,7 @@ public function testMultiConstraintOptimizations($constraints, ConstraintInterfa
321321
/**
322322
* @return array<mixed>
323323
*/
324-
public function multiConstraintOptimizations()
324+
public static function multiConstraintOptimizations()
325325
{
326326
return array(
327327
'Test collapses contiguous' => array(

‎tests/IntervalsTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function testCompactConstraint($expected, $toCompact, $conjunctive)
5151
$this->assertSame((string) $expected, (string) $new);
5252
}
5353

54-
public function compactProvider()
54+
public static function compactProvider()
5555
{
5656
return array(
5757
'simple disjunctive multi' => array(
@@ -238,7 +238,7 @@ public function testGetIntervals($expected, $constraint)
238238
$this->assertSame($expected, $result);
239239
}
240240

241-
public function intervalsProvider()
241+
public static function intervalsProvider()
242242
{
243243
return array(
244244
'simple case' => array(

‎tests/SemverTest.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function testUsortShouldInitialVersionParserClass()
7979
/**
8080
* @return array<mixed>
8181
*/
82-
public function sortProvider()
82+
public static function sortProvider()
8383
{
8484
return array(
8585
array(
@@ -98,27 +98,27 @@ public function sortProvider()
9898
/**
9999
* @return array<mixed>
100100
*/
101-
public function satisfiesProvider()
101+
public static function satisfiesProvider()
102102
{
103103
$positive = array_map(function ($array) {
104104
array_unshift($array, true);
105105

106106
return $array;
107-
}, $this->satisfiesProviderPositive());
107+
}, static::satisfiesProviderPositive());
108108

109109
$negative = array_map(function ($array) {
110110
array_unshift($array, false);
111111

112112
return $array;
113-
}, $this->satisfiesProviderNegative());
113+
}, static::satisfiesProviderNegative());
114114

115115
return array_merge($positive, $negative);
116116
}
117117

118118
/**
119119
* @return array<mixed>
120120
*/
121-
public function satisfiesProviderPositive()
121+
public static function satisfiesProviderPositive()
122122
{
123123
return array(
124124
array('1.2.3', '1.0.0 - 2.0.0'),
@@ -200,7 +200,7 @@ public function satisfiesProviderPositive()
200200
/**
201201
* @return array<mixed>
202202
*/
203-
public function satisfiesProviderNegative()
203+
public static function satisfiesProviderNegative()
204204
{
205205
return array(
206206
array('2.2.3', '1.0.0 - 2.0.0'),
@@ -254,7 +254,7 @@ public function satisfiesProviderNegative()
254254
/**
255255
* @return array<mixed>
256256
*/
257-
public function satisfiedByProvider()
257+
public static function satisfiedByProvider()
258258
{
259259
return array(
260260
array(

‎tests/SubsetsTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function testIsSubsetOf($aStr, $bStr)
3434
/**
3535
* @return array<mixed>
3636
*/
37-
public function subsets()
37+
public static function subsets()
3838
{
3939
return array(
4040
// x is subset of y
@@ -101,7 +101,7 @@ public function testIsNotSubsetOf($aStr, $bStr)
101101
/**
102102
* @return array<mixed>
103103
*/
104-
public function notSubsets()
104+
public static function notSubsets()
105105
{
106106
return array(
107107
// x is subset of y

‎tests/VersionParserTest.php

+16-16
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testParseNumericAliasPrefix($input, $expected)
3333
/**
3434
* @return array<mixed>
3535
*/
36-
public function numericAliasVersions()
36+
public static function numericAliasVersions()
3737
{
3838
return array(
3939
array('0.x-dev', '0.'),
@@ -62,7 +62,7 @@ public function testNormalizeSucceeds($input, $expected)
6262
/**
6363
* @return array<mixed>
6464
*/
65-
public function successfulNormalizedVersions()
65+
public static function successfulNormalizedVersions()
6666
{
6767
return array(
6868
'none' => array('1.0.0', '1.0.0.0'),
@@ -157,7 +157,7 @@ public function testNormalizeFails($input)
157157
/**
158158
* @return array<mixed>
159159
*/
160-
public function failingNormalizedVersions()
160+
public static function failingNormalizedVersions()
161161
{
162162
return array(
163163
'empty ' => array(''),
@@ -208,7 +208,7 @@ public function testNormalizeFailsAndReportsAliasIssue($fullInput)
208208
/**
209209
* @return array<mixed>
210210
*/
211-
public function failingNormalizedVersionsWithBadAlias()
211+
public static function failingNormalizedVersionsWithBadAlias()
212212
{
213213
return array(
214214
'Alias and caret' => array('1.0.0+foo as ^2.0'),
@@ -238,7 +238,7 @@ public function testNormalizeFailsAndReportsAliaseeIssue($fullInput)
238238
/**
239239
* @return array<mixed>
240240
*/
241-
public function failingNormalizedVersionsWithBadAliasee()
241+
public static function failingNormalizedVersionsWithBadAliasee()
242242
{
243243
return array(
244244
'Alias and caret' => array('^2.0 as 1.0.0+foo'),
@@ -264,7 +264,7 @@ public function testNormalizeBranch($input, $expected)
264264
/**
265265
* @return array<mixed>
266266
*/
267-
public function successfulNormalizedBranches()
267+
public static function successfulNormalizedBranches()
268268
{
269269
return array(
270270
'parses x' => array('v1.x', '1.9999999.9999999.9999999-dev'),
@@ -333,7 +333,7 @@ public function testParseConstraintsSimple($input, $expected)
333333
/**
334334
* @return array<mixed>
335335
*/
336-
public function simpleConstraints()
336+
public static function simpleConstraints()
337337
{
338338
return array(
339339
'match any' => array('*', new MatchAllConstraint()),
@@ -392,7 +392,7 @@ public function testParseConstraintsWildcard($input, $min, $max)
392392
/**
393393
* @return array<mixed>
394394
*/
395-
public function wildcardConstraints()
395+
public static function wildcardConstraints()
396396
{
397397
return array(
398398
array('v2.*', new Constraint('>=', '2.0.0.0-dev'), new Constraint('<', '3.0.0.0-dev')),
@@ -434,7 +434,7 @@ public function testParseTildeWildcard($input, $min, $max)
434434
/**
435435
* @return array<mixed>
436436
*/
437-
public function tildeConstraints()
437+
public static function tildeConstraints()
438438
{
439439
return array(
440440
array('~v1', new Constraint('>=', '1.0.0.0-dev'), new Constraint('<', '2.0.0.0-dev')),
@@ -481,7 +481,7 @@ public function testParseCaretWildcard($input, $min, $max)
481481
/**
482482
* @return array<mixed>
483483
*/
484-
public function caretConstraints()
484+
public static function caretConstraints()
485485
{
486486
return array(
487487
array('^v1', new Constraint('>=', '1.0.0.0-dev'), new Constraint('<', '2.0.0.0-dev')),
@@ -531,7 +531,7 @@ public function testParseHyphen($input, $min, $max)
531531
/**
532532
* @return array<mixed>
533533
*/
534-
public function hyphenConstraints()
534+
public static function hyphenConstraints()
535535
{
536536
return array(
537537
array('v1 - v2', new Constraint('>=', '1.0.0.0-dev'), new Constraint('<', '3.0.0.0-dev')),
@@ -566,7 +566,7 @@ public function testParseConstraints($constraint, $expected)
566566
/**
567567
* @return array<mixed>
568568
*/
569-
public function constraintProvider()
569+
public static function constraintProvider()
570570
{
571571
return array(
572572
// numeric branch
@@ -618,7 +618,7 @@ public function testParseConstraintsMulti($constraint)
618618
/**
619619
* @return array<mixed>
620620
*/
621-
public function multiConstraintProvider()
621+
public static function multiConstraintProvider()
622622
{
623623
return array(
624624
array('>2.0,<=3.0'),
@@ -670,7 +670,7 @@ public function testParseConstraintsMultiDisjunctiveHasPrioOverConjuctive($const
670670
/**
671671
* @return array<mixed>
672672
*/
673-
public function multiConstraintProvider2()
673+
public static function multiConstraintProvider2()
674674
{
675675
return array(
676676
array('>2.0,<2.0.5 | >2.0.6'),
@@ -724,7 +724,7 @@ public function testParseConstraintsFails($input)
724724
/**
725725
* @return array<mixed>
726726
*/
727-
public function failingConstraints()
727+
public static function failingConstraints()
728728
{
729729
return array(
730730
'empty ' => array(''),
@@ -783,7 +783,7 @@ public function testParseStability($expected, $version)
783783
/**
784784
* @return array<mixed>
785785
*/
786-
public function stabilityProvider()
786+
public static function stabilityProvider()
787787
{
788788
return array(
789789
array('stable', '1'),

0 commit comments

Comments
 (0)