Skip to content

Commit 0612356

Browse files
Merge branch '5.4' into 6.2
* 5.4: [Translation][Mailer] Convert `$this` calls to static ones in data providers [BC Break] Make data providers for abstract test cases static use TestCase suffix for abstract tests in Tests directories Fix Request locale property doc types Bump absolute lowest dep to 4.4
2 parents 8d7daad + 535d93f commit 0612356

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Tests/Constraints/EmailValidatorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function testValidInLooseModeEmails($email)
9595
$this->assertNoViolation();
9696
}
9797

98-
public function getEmailsOnlyValidInLooseMode()
98+
public static function getEmailsOnlyValidInLooseMode()
9999
{
100100
return [
101101
@@ -137,7 +137,7 @@ public function testValidNormalizedEmailsInLooseMode($email)
137137
$this->assertNoViolation();
138138
}
139139

140-
public function getEmailsWithWhitespacesOnlyValidInLooseMode()
140+
public static function getEmailsWithWhitespacesOnlyValidInLooseMode()
141141
{
142142
return [
143143
["\x09\x09[email protected]\x09\x09"],
@@ -252,7 +252,7 @@ public function testInvalidAllowNoTldEmails($email)
252252
->assertRaised();
253253
}
254254

255-
public function getInvalidAllowNoTldEmails()
255+
public static function getInvalidAllowNoTldEmails()
256256
{
257257
return [
258258
['example bar'],

Tests/Constraints/FileValidatorTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ public function testExtensionValid(string $name)
551551
$this->assertNoViolation();
552552
}
553553

554-
private function validExtensionProvider(): iterable
554+
private static function validExtensionProvider(): iterable
555555
{
556556
yield ['test.gif'];
557557
yield ['test.png.gif'];
@@ -582,7 +582,7 @@ public function testExtensionInvalid(string $name, string $extension)
582582
->assertRaised();
583583
}
584584

585-
private function invalidExtensionProvider(): iterable
585+
private static function invalidExtensionProvider(): iterable
586586
{
587587
yield ['test.gif', 'gif'];
588588
yield ['test.png.gif', 'gif'];

Tests/Constraints/ImageValidatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ public function testInvalidMimeTypeWithNarrowedSet(Image $constraint)
564564
->assertRaised();
565565
}
566566

567-
public function provideInvalidMimeTypeWithNarrowedSet()
567+
public static function provideInvalidMimeTypeWithNarrowedSet()
568568
{
569569
yield 'Doctrine style' => [new Image([
570570
'mimeTypes' => [

Tests/Constraints/UniqueValidatorTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testValidValues($value)
4040
$this->assertNoViolation();
4141
}
4242

43-
public function getValidValues()
43+
public static function getValidValues()
4444
{
4545
return [
4646
yield 'null' => [[null]],
@@ -73,7 +73,7 @@ public function testInvalidValues($value)
7373
->assertRaised();
7474
}
7575

76-
public function getInvalidValues()
76+
public static function getInvalidValues()
7777
{
7878
$object = new \stdClass();
7979

@@ -154,7 +154,7 @@ public function testExpectsNonUniqueObjects($callback)
154154
->assertRaised();
155155
}
156156

157-
public function getCallback(): array
157+
public static function getCallback(): array
158158
{
159159
return [
160160
'static function' => [static function (\stdClass $object) {
@@ -241,7 +241,7 @@ public function testCollectionFieldNamesMustBeString(string $type, mixed $field)
241241
$this->validator->validate([['value' => 5], ['id' => 1, 'value' => 6]], new Unique(fields: [$field]));
242242
}
243243

244-
public function getInvalidFieldNames(): array
244+
public static function getInvalidFieldNames(): array
245245
{
246246
return [
247247
['stdClass', new \stdClass()],
@@ -265,7 +265,7 @@ public function testInvalidCollectionValues(array $value, array $fields)
265265
->assertRaised();
266266
}
267267

268-
public function getInvalidCollectionValues(): array
268+
public static function getInvalidCollectionValues(): array
269269
{
270270
return [
271271
'unique string' => [[

0 commit comments

Comments
 (0)