Skip to content

Commit c103bb2

Browse files
alexandre-dauboisalexandre-daubois
committed
[Tests] Migrate tests to static data providers
1 parent 157c0c0 commit c103bb2

14 files changed

+86
-82
lines changed

‎Tests/Constraints/AbstractComparisonValidatorTestCase.php

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected static function addPhp5Dot5Comparisons(array $comparisons)
6969
return $result;
7070
}
7171

72-
public function provideInvalidConstraintOptions()
72+
public static function provideInvalidConstraintOptions()
7373
{
7474
return [
7575
[null],
@@ -112,15 +112,16 @@ public function testValidComparisonToValue($dirtyValue, $comparisonValue)
112112
$this->assertNoViolation();
113113
}
114114

115-
public function provideAllValidComparisons(): array
115+
public static function provideAllValidComparisons(): array
116116
{
117117
// The provider runs before setUp(), so we need to manually fix
118118
// the default timezone
119-
$this->setDefaultTimezone('UTC');
119+
$timezone = date_default_timezone_get();
120+
date_default_timezone_set('UTC');
120121

121-
$comparisons = self::addPhp5Dot5Comparisons($this->provideValidComparisons());
122+
$comparisons = self::addPhp5Dot5Comparisons(static::provideValidComparisons());
122123

123-
$this->restoreDefaultTimezone();
124+
date_default_timezone_set($timezone);
124125

125126
return $comparisons;
126127
}
@@ -166,9 +167,9 @@ public function testInvalidValuePath()
166167
$this->validator->validate(5, $constraint);
167168
}
168169

169-
abstract public function provideValidComparisons(): array;
170+
abstract public static function provideValidComparisons(): array;
170171

171-
abstract public function provideValidComparisonsToPropertyPath(): array;
172+
abstract public static function provideValidComparisonsToPropertyPath(): array;
172173

173174
/**
174175
* @dataProvider provideAllInvalidComparisons
@@ -233,9 +234,9 @@ public function testThrowsOnInvalidStringDates(AbstractComparison $constraint, $
233234
$this->validator->validate($value, $constraint);
234235
}
235236

236-
public function throwsOnInvalidStringDatesProvider(): array
237+
public static function throwsOnInvalidStringDatesProvider(): array
237238
{
238-
$constraint = $this->createConstraint([
239+
$constraint = static::createConstraint([
239240
'value' => 'foo',
240241
]);
241242

@@ -273,27 +274,28 @@ public function testCompareWithNullValueAtPropertyAt($dirtyValue, $dirtyValueAsS
273274
}
274275
}
275276

276-
public function provideAllInvalidComparisons(): array
277+
public static function provideAllInvalidComparisons(): array
277278
{
278279
// The provider runs before setUp(), so we need to manually fix
279280
// the default timezone
280-
$this->setDefaultTimezone('UTC');
281+
$timezone = date_default_timezone_get();
282+
date_default_timezone_set('UTC');
281283

282-
$comparisons = self::addPhp5Dot5Comparisons($this->provideInvalidComparisons());
284+
$comparisons = self::addPhp5Dot5Comparisons(static::provideInvalidComparisons());
283285

284-
$this->restoreDefaultTimezone();
286+
date_default_timezone_set($timezone);
285287

286288
return $comparisons;
287289
}
288290

289-
abstract public function provideInvalidComparisons(): array;
291+
abstract public static function provideInvalidComparisons(): array;
290292

291-
abstract public function provideComparisonsToNullValueAtPropertyPath();
293+
abstract public static function provideComparisonsToNullValueAtPropertyPath();
292294

293295
/**
294296
* @param array|null $options Options for the constraint
295297
*/
296-
abstract protected function createConstraint(array $options = null): Constraint;
298+
abstract protected static function createConstraint(array $options = null): Constraint;
297299

298300
protected function getErrorCode(): ?string
299301
{

‎Tests/Constraints/DivisibleByValidatorTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected function createValidator()
2626
return new DivisibleByValidator();
2727
}
2828

29-
protected function createConstraint(array $options = null): Constraint
29+
protected static function createConstraint(array $options = null): Constraint
3030
{
3131
return new DivisibleBy($options);
3232
}
@@ -39,7 +39,7 @@ protected function getErrorCode(): ?string
3939
/**
4040
* {@inheritdoc}
4141
*/
42-
public function provideValidComparisons(): array
42+
public static function provideValidComparisons(): array
4343
{
4444
return [
4545
[-7, 1],
@@ -68,7 +68,7 @@ public function provideValidComparisons(): array
6868
/**
6969
* {@inheritdoc}
7070
*/
71-
public function provideValidComparisonsToPropertyPath(): array
71+
public static function provideValidComparisonsToPropertyPath(): array
7272
{
7373
return [
7474
[25],
@@ -78,7 +78,7 @@ public function provideValidComparisonsToPropertyPath(): array
7878
/**
7979
* {@inheritdoc}
8080
*/
81-
public function provideInvalidComparisons(): array
81+
public static function provideInvalidComparisons(): array
8282
{
8383
return [
8484
[1, '1', 2, '2', 'int'],
@@ -112,8 +112,8 @@ public function throwsOnNonNumericValuesProvider()
112112
];
113113
}
114114

115-
public function provideComparisonsToNullValueAtPropertyPath()
115+
public static function provideComparisonsToNullValueAtPropertyPath()
116116
{
117-
$this->markTestSkipped('DivisibleByValidator rejects null values.');
117+
self::markTestSkipped('DivisibleByValidator rejects null values.');
118118
}
119119
}

‎Tests/Constraints/EqualToValidatorTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function createValidator()
2525
return new EqualToValidator();
2626
}
2727

28-
protected function createConstraint(array $options = null): Constraint
28+
protected static function createConstraint(array $options = null): Constraint
2929
{
3030
return new EqualTo($options);
3131
}
@@ -38,7 +38,7 @@ protected function getErrorCode(): ?string
3838
/**
3939
* {@inheritdoc}
4040
*/
41-
public function provideValidComparisons(): array
41+
public static function provideValidComparisons(): array
4242
{
4343
return [
4444
[3, 3],
@@ -55,7 +55,7 @@ public function provideValidComparisons(): array
5555
/**
5656
* {@inheritdoc}
5757
*/
58-
public function provideValidComparisonsToPropertyPath(): array
58+
public static function provideValidComparisonsToPropertyPath(): array
5959
{
6060
return [
6161
[5],
@@ -65,7 +65,7 @@ public function provideValidComparisonsToPropertyPath(): array
6565
/**
6666
* {@inheritdoc}
6767
*/
68-
public function provideInvalidComparisons(): array
68+
public static function provideInvalidComparisons(): array
6969
{
7070
return [
7171
[1, '1', 2, '2', 'int'],
@@ -77,7 +77,7 @@ public function provideInvalidComparisons(): array
7777
];
7878
}
7979

80-
public function provideComparisonsToNullValueAtPropertyPath()
80+
public static function provideComparisonsToNullValueAtPropertyPath()
8181
{
8282
return [
8383
[5, '5', false],

‎Tests/Constraints/GreaterThanOrEqualValidatorTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function createValidator()
2525
return new GreaterThanOrEqualValidator();
2626
}
2727

28-
protected function createConstraint(array $options = null): Constraint
28+
protected static function createConstraint(array $options = null): Constraint
2929
{
3030
return new GreaterThanOrEqual($options);
3131
}
@@ -38,7 +38,7 @@ protected function getErrorCode(): ?string
3838
/**
3939
* {@inheritdoc}
4040
*/
41-
public function provideValidComparisons(): array
41+
public static function provideValidComparisons(): array
4242
{
4343
return [
4444
[3, 2],
@@ -58,7 +58,7 @@ public function provideValidComparisons(): array
5858
/**
5959
* {@inheritdoc}
6060
*/
61-
public function provideValidComparisonsToPropertyPath(): array
61+
public static function provideValidComparisonsToPropertyPath(): array
6262
{
6363
return [
6464
[5],
@@ -69,7 +69,7 @@ public function provideValidComparisonsToPropertyPath(): array
6969
/**
7070
* {@inheritdoc}
7171
*/
72-
public function provideInvalidComparisons(): array
72+
public static function provideInvalidComparisons(): array
7373
{
7474
return [
7575
[1, '1', 2, '2', 'int'],
@@ -80,7 +80,7 @@ public function provideInvalidComparisons(): array
8080
];
8181
}
8282

83-
public function provideComparisonsToNullValueAtPropertyPath()
83+
public static function provideComparisonsToNullValueAtPropertyPath()
8484
{
8585
return [
8686
[5, '5', true],

‎Tests/Constraints/GreaterThanOrEqualValidatorWithPositiveOrZeroConstraintTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
*/
2222
class GreaterThanOrEqualValidatorWithPositiveOrZeroConstraintTest extends GreaterThanOrEqualValidatorTest
2323
{
24-
protected function createConstraint(array $options = null): Constraint
24+
protected static function createConstraint(array $options = null): Constraint
2525
{
2626
return new PositiveOrZero();
2727
}
2828

2929
/**
3030
* {@inheritdoc}
3131
*/
32-
public function provideValidComparisons(): array
32+
public static function provideValidComparisons(): array
3333
{
3434
return [
3535
[0, 0],
@@ -45,7 +45,7 @@ public function provideValidComparisons(): array
4545
/**
4646
* {@inheritdoc}
4747
*/
48-
public function provideInvalidComparisons(): array
48+
public static function provideInvalidComparisons(): array
4949
{
5050
return [
5151
[-1, '-1', 0, '0', 'int'],

‎Tests/Constraints/GreaterThanValidatorTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function createValidator()
2525
return new GreaterThanValidator();
2626
}
2727

28-
protected function createConstraint(array $options = null): Constraint
28+
protected static function createConstraint(array $options = null): Constraint
2929
{
3030
return new GreaterThan($options);
3131
}
@@ -38,7 +38,7 @@ protected function getErrorCode(): ?string
3838
/**
3939
* {@inheritdoc}
4040
*/
41-
public function provideValidComparisons(): array
41+
public static function provideValidComparisons(): array
4242
{
4343
return [
4444
[2, 1],
@@ -54,7 +54,7 @@ public function provideValidComparisons(): array
5454
/**
5555
* {@inheritdoc}
5656
*/
57-
public function provideValidComparisonsToPropertyPath(): array
57+
public static function provideValidComparisonsToPropertyPath(): array
5858
{
5959
return [
6060
[6],
@@ -64,7 +64,7 @@ public function provideValidComparisonsToPropertyPath(): array
6464
/**
6565
* {@inheritdoc}
6666
*/
67-
public function provideInvalidComparisons(): array
67+
public static function provideInvalidComparisons(): array
6868
{
6969
return [
7070
[1, '1', 2, '2', 'int'],
@@ -82,7 +82,7 @@ public function provideInvalidComparisons(): array
8282
];
8383
}
8484

85-
public function provideComparisonsToNullValueAtPropertyPath()
85+
public static function provideComparisonsToNullValueAtPropertyPath()
8686
{
8787
return [
8888
[5, '5', true],

‎Tests/Constraints/GreaterThanValidatorWithPositiveConstraintTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
*/
2222
class GreaterThanValidatorWithPositiveConstraintTest extends GreaterThanValidatorTest
2323
{
24-
protected function createConstraint(array $options = null): Constraint
24+
protected static function createConstraint(array $options = null): Constraint
2525
{
2626
return new Positive();
2727
}
2828

2929
/**
3030
* {@inheritdoc}
3131
*/
32-
public function provideValidComparisons(): array
32+
public static function provideValidComparisons(): array
3333
{
3434
return [
3535
[2, 0],
@@ -42,7 +42,7 @@ public function provideValidComparisons(): array
4242
/**
4343
* {@inheritdoc}
4444
*/
45-
public function provideInvalidComparisons(): array
45+
public static function provideInvalidComparisons(): array
4646
{
4747
return [
4848
[0, '0', 0, '0', 'int'],

‎Tests/Constraints/IdenticalToValidatorTest.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function createValidator()
2525
return new IdenticalToValidator();
2626
}
2727

28-
protected function createConstraint(array $options = null): Constraint
28+
protected static function createConstraint(array $options = null): Constraint
2929
{
3030
return new IdenticalTo($options);
3131
}
@@ -35,23 +35,24 @@ protected function getErrorCode(): ?string
3535
return IdenticalTo::NOT_IDENTICAL_ERROR;
3636
}
3737

38-
public function provideAllValidComparisons(): array
38+
public static function provideAllValidComparisons(): array
3939
{
40-
$this->setDefaultTimezone('UTC');
40+
$timezone = date_default_timezone_get();
41+
date_default_timezone_set('UTC');
4142

4243
// Don't call addPhp5Dot5Comparisons() automatically, as it does
4344
// not take care of identical objects
44-
$comparisons = $this->provideValidComparisons();
45+
$comparisons = self::provideValidComparisons();
4546

46-
$this->restoreDefaultTimezone();
47+
date_default_timezone_set($timezone);
4748

4849
return $comparisons;
4950
}
5051

5152
/**
5253
* {@inheritdoc}
5354
*/
54-
public function provideValidComparisons(): array
55+
public static function provideValidComparisons(): array
5556
{
5657
$date = new \DateTime('2000-01-01');
5758
$object = new ComparisonTest_Class(2);
@@ -73,7 +74,7 @@ public function provideValidComparisons(): array
7374
/**
7475
* {@inheritdoc}
7576
*/
76-
public function provideValidComparisonsToPropertyPath(): array
77+
public static function provideValidComparisonsToPropertyPath(): array
7778
{
7879
return [
7980
[5],
@@ -83,7 +84,7 @@ public function provideValidComparisonsToPropertyPath(): array
8384
/**
8485
* {@inheritdoc}
8586
*/
86-
public function provideInvalidComparisons(): array
87+
public static function provideInvalidComparisons(): array
8788
{
8889
return [
8990
[1, '1', 2, '2', 'int'],
@@ -95,7 +96,7 @@ public function provideInvalidComparisons(): array
9596
];
9697
}
9798

98-
public function provideComparisonsToNullValueAtPropertyPath()
99+
public static function provideComparisonsToNullValueAtPropertyPath()
99100
{
100101
return [
101102
[5, '5', false],

0 commit comments

Comments
 (0)