Skip to content

Commit 1ae3c54

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.2
* 5.4: [FrameworkBundle] Improve error message in MicroKernelTrait when using deprecated configureRoutes(RouteCollectionBuilder) with symfony/routing >= 6.0 Add warning about Symfony 5.2 changing pcntl_async_signals [Tests] Fix static calls and Mock var annotation [FrameworkBundle] Fix checkboxes check assertions [Notifier][WebProfilerBundle] Ignore messages whose `getNotification` returns `null` [HttpClient] Fix over-encoding of URL parts to match browser's behavior Fix Psalm job [HttpClient] Fix data collector [Tests] Migrate tests to static data providers [Semaphore] Fix test Fix: Split and clean up tests Remove unused data provider add Sender to the list of bypassed headers
2 parents cc2dbb9 + c103bb2 commit 1ae3c54

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],
@@ -109,15 +109,16 @@ public function testValidComparisonToValue($dirtyValue, $comparisonValue)
109109
$this->assertNoViolation();
110110
}
111111

112-
public function provideAllValidComparisons(): array
112+
public static function provideAllValidComparisons(): array
113113
{
114114
// The provider runs before setUp(), so we need to manually fix
115115
// the default timezone
116-
$this->setDefaultTimezone('UTC');
116+
$timezone = date_default_timezone_get();
117+
date_default_timezone_set('UTC');
117118

118-
$comparisons = self::addPhp5Dot5Comparisons($this->provideValidComparisons());
119+
$comparisons = self::addPhp5Dot5Comparisons(static::provideValidComparisons());
119120

120-
$this->restoreDefaultTimezone();
121+
date_default_timezone_set($timezone);
121122

122123
return $comparisons;
123124
}
@@ -163,9 +164,9 @@ public function testInvalidValuePath()
163164
$this->validator->validate(5, $constraint);
164165
}
165166

166-
abstract public function provideValidComparisons(): array;
167+
abstract public static function provideValidComparisons(): array;
167168

168-
abstract public function provideValidComparisonsToPropertyPath(): array;
169+
abstract public static function provideValidComparisonsToPropertyPath(): array;
169170

170171
/**
171172
* @dataProvider provideAllInvalidComparisons
@@ -224,9 +225,9 @@ public function testThrowsOnInvalidStringDates(AbstractComparison $constraint, $
224225
$this->validator->validate($value, $constraint);
225226
}
226227

227-
public function throwsOnInvalidStringDatesProvider(): array
228+
public static function throwsOnInvalidStringDatesProvider(): array
228229
{
229-
$constraint = $this->createConstraint([
230+
$constraint = static::createConstraint([
230231
'value' => 'foo',
231232
]);
232233

@@ -264,24 +265,25 @@ public function testCompareWithNullValueAtPropertyAt($dirtyValue, $dirtyValueAsS
264265
}
265266
}
266267

267-
public function provideAllInvalidComparisons(): array
268+
public static function provideAllInvalidComparisons(): array
268269
{
269270
// The provider runs before setUp(), so we need to manually fix
270271
// the default timezone
271-
$this->setDefaultTimezone('UTC');
272+
$timezone = date_default_timezone_get();
273+
date_default_timezone_set('UTC');
272274

273-
$comparisons = self::addPhp5Dot5Comparisons($this->provideInvalidComparisons());
275+
$comparisons = self::addPhp5Dot5Comparisons(static::provideInvalidComparisons());
274276

275-
$this->restoreDefaultTimezone();
277+
date_default_timezone_set($timezone);
276278

277279
return $comparisons;
278280
}
279281

280-
abstract public function provideInvalidComparisons(): array;
282+
abstract public static function provideInvalidComparisons(): array;
281283

282-
abstract public function provideComparisonsToNullValueAtPropertyPath();
284+
abstract public static function provideComparisonsToNullValueAtPropertyPath();
283285

284-
abstract protected function createConstraint(array $options = null): Constraint;
286+
abstract protected static function createConstraint(array $options = null): Constraint;
285287

286288
protected function getErrorCode(): ?string
287289
{

‎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(): DivisibleByValidator
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
}
@@ -36,7 +36,7 @@ protected function getErrorCode(): ?string
3636
return DivisibleBy::NOT_DIVISIBLE_BY;
3737
}
3838

39-
public function provideValidComparisons(): array
39+
public static function provideValidComparisons(): array
4040
{
4141
return [
4242
[-7, 1],
@@ -62,14 +62,14 @@ public function provideValidComparisons(): array
6262
];
6363
}
6464

65-
public function provideValidComparisonsToPropertyPath(): array
65+
public static function provideValidComparisonsToPropertyPath(): array
6666
{
6767
return [
6868
[25],
6969
];
7070
}
7171

72-
public function provideInvalidComparisons(): array
72+
public static function provideInvalidComparisons(): array
7373
{
7474
return [
7575
[1, '1', 2, '2', 'int'],
@@ -103,8 +103,8 @@ public function throwsOnNonNumericValuesProvider()
103103
];
104104
}
105105

106-
public function provideComparisonsToNullValueAtPropertyPath()
106+
public static function provideComparisonsToNullValueAtPropertyPath()
107107
{
108-
$this->markTestSkipped('DivisibleByValidator rejects null values.');
108+
self::markTestSkipped('DivisibleByValidator rejects null values.');
109109
}
110110
}

‎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(): EqualToValidator
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
}
@@ -35,7 +35,7 @@ protected function getErrorCode(): ?string
3535
return EqualTo::NOT_EQUAL_ERROR;
3636
}
3737

38-
public function provideValidComparisons(): array
38+
public static function provideValidComparisons(): array
3939
{
4040
return [
4141
[3, 3],
@@ -49,14 +49,14 @@ public function provideValidComparisons(): array
4949
];
5050
}
5151

52-
public function provideValidComparisonsToPropertyPath(): array
52+
public static function provideValidComparisonsToPropertyPath(): array
5353
{
5454
return [
5555
[5],
5656
];
5757
}
5858

59-
public function provideInvalidComparisons(): array
59+
public static function provideInvalidComparisons(): array
6060
{
6161
return [
6262
[1, '1', 2, '2', 'int'],
@@ -68,7 +68,7 @@ public function provideInvalidComparisons(): array
6868
];
6969
}
7070

71-
public function provideComparisonsToNullValueAtPropertyPath()
71+
public static function provideComparisonsToNullValueAtPropertyPath()
7272
{
7373
return [
7474
[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(): GreaterThanOrEqualValidator
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
}
@@ -35,7 +35,7 @@ protected function getErrorCode(): ?string
3535
return GreaterThanOrEqual::TOO_LOW_ERROR;
3636
}
3737

38-
public function provideValidComparisons(): array
38+
public static function provideValidComparisons(): array
3939
{
4040
return [
4141
[3, 2],
@@ -52,15 +52,15 @@ public function provideValidComparisons(): array
5252
];
5353
}
5454

55-
public function provideValidComparisonsToPropertyPath(): array
55+
public static function provideValidComparisonsToPropertyPath(): array
5656
{
5757
return [
5858
[5],
5959
[6],
6060
];
6161
}
6262

63-
public function provideInvalidComparisons(): array
63+
public static function provideInvalidComparisons(): array
6464
{
6565
return [
6666
[1, '1', 2, '2', 'int'],
@@ -71,7 +71,7 @@ public function provideInvalidComparisons(): array
7171
];
7272
}
7373

74-
public function provideComparisonsToNullValueAtPropertyPath()
74+
public static function provideComparisonsToNullValueAtPropertyPath()
7575
{
7676
return [
7777
[5, '5', true],

‎Tests/Constraints/GreaterThanOrEqualValidatorWithPositiveOrZeroConstraintTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
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

29-
public function provideValidComparisons(): array
29+
public static function provideValidComparisons(): array
3030
{
3131
return [
3232
[0, 0],
@@ -39,7 +39,7 @@ public function provideValidComparisons(): array
3939
];
4040
}
4141

42-
public function provideInvalidComparisons(): array
42+
public static function provideInvalidComparisons(): array
4343
{
4444
return [
4545
[-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(): GreaterThanValidator
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
}
@@ -35,7 +35,7 @@ protected function getErrorCode(): ?string
3535
return GreaterThan::TOO_LOW_ERROR;
3636
}
3737

38-
public function provideValidComparisons(): array
38+
public static function provideValidComparisons(): array
3939
{
4040
return [
4141
[2, 1],
@@ -48,14 +48,14 @@ public function provideValidComparisons(): array
4848
];
4949
}
5050

51-
public function provideValidComparisonsToPropertyPath(): array
51+
public static function provideValidComparisonsToPropertyPath(): array
5252
{
5353
return [
5454
[6],
5555
];
5656
}
5757

58-
public function provideInvalidComparisons(): array
58+
public static function provideInvalidComparisons(): array
5959
{
6060
return [
6161
[1, '1', 2, '2', 'int'],
@@ -73,7 +73,7 @@ public function provideInvalidComparisons(): array
7373
];
7474
}
7575

76-
public function provideComparisonsToNullValueAtPropertyPath()
76+
public static function provideComparisonsToNullValueAtPropertyPath()
7777
{
7878
return [
7979
[5, '5', true],

‎Tests/Constraints/GreaterThanValidatorWithPositiveConstraintTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
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

29-
public function provideValidComparisons(): array
29+
public static function provideValidComparisons(): array
3030
{
3131
return [
3232
[2, 0],
@@ -36,7 +36,7 @@ public function provideValidComparisons(): array
3636
];
3737
}
3838

39-
public function provideInvalidComparisons(): array
39+
public static function provideInvalidComparisons(): array
4040
{
4141
return [
4242
[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(): IdenticalToValidator
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,20 +35,21 @@ 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

51-
public function provideValidComparisons(): array
52+
public static function provideValidComparisons(): array
5253
{
5354
$date = new \DateTime('2000-01-01');
5455
$object = new ComparisonTest_Class(2);
@@ -67,14 +68,14 @@ public function provideValidComparisons(): array
6768
return $comparisons;
6869
}
6970

70-
public function provideValidComparisonsToPropertyPath(): array
71+
public static function provideValidComparisonsToPropertyPath(): array
7172
{
7273
return [
7374
[5],
7475
];
7576
}
7677

77-
public function provideInvalidComparisons(): array
78+
public static function provideInvalidComparisons(): array
7879
{
7980
return [
8081
[1, '1', 2, '2', 'int'],
@@ -86,7 +87,7 @@ public function provideInvalidComparisons(): array
8687
];
8788
}
8889

89-
public function provideComparisonsToNullValueAtPropertyPath()
90+
public static function provideComparisonsToNullValueAtPropertyPath()
9091
{
9192
return [
9293
[5, '5', false],

0 commit comments

Comments
 (0)