Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 3adbccb5fae1 · 2023-02-14T09:44:56.000+01:00
* 5.4:
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/AddressTest.php b/Tests/AddressTest.php
@@ -86,12 +86,12 @@ public function testNameEmpty(string $name)
         $this->assertSame($mail, (new Address($mail, $name))->toString());
     }
 
-    public function nameEmptyDataProvider(): array
+    public static function nameEmptyDataProvider(): array
     {
         return [[''], [' '], [" \r\n "]];
     }
 
-    public function fromStringProvider()
+    public static function fromStringProvider()
     {
         return [
             [
diff --git a/Tests/Crypto/DkimSignerTest.php b/Tests/Crypto/DkimSignerTest.php
@@ -68,7 +68,7 @@ public function testSign(int $time, string $bodyCanon, string $headerCanon, stri
         $this->assertEquals($header, $signedMessage->getHeaders()->get('DKIM-Signature')->getBody());
     }
 
-    public function getSignData()
+    public static function getSignData()
     {
         yield 'simple/simple' => [
             1591597074, DkimSigner::CANON_SIMPLE, DkimSigner::CANON_SIMPLE,
@@ -132,7 +132,7 @@ public function testCanonicalizeHeader(string $bodyCanon, string $canonBody, str
         $this->assertEquals(\strlen($canonBody), $l);
     }
 
-    public function getCanonicalizeHeaderData()
+    public static function getCanonicalizeHeaderData()
     {
         yield 'simple_empty' => [
             DkimSigner::CANON_SIMPLE, "\r\n", '', \PHP_INT_MAX,
diff --git a/Tests/RawMessageTest.php b/Tests/RawMessageTest.php
@@ -29,7 +29,7 @@ public function testToString($messageParameter)
         $this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));
     }
 
-    public function provideMessages(): array
+    public static function provideMessages(): array
     {
         return [
             'string' => ['some string'],

Original file line number	Diff line number	Diff line change
`@@ -86,12 +86,12 @@ public function testNameEmpty(string $name)`
`86`	`86`	`$this->assertSame($mail, (new Address($mail, $name))->toString());`
`87`	`87`	`}`
`88`	`88`
`89`		`- public function nameEmptyDataProvider(): array`
	`89`	`+ public static function nameEmptyDataProvider(): array`
`90`	`90`	`{`
`91`	`91`	`return [[''], [' '], [" \r\n "]];`
`92`	`92`	`}`
`93`	`93`
`94`		`- public function fromStringProvider()`
	`94`	`+ public static function fromStringProvider()`
`95`	`95`	`{`
`96`	`96`	`return [`
`97`	`97`	`[`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function testSign(int $time, string $bodyCanon, string $headerCanon, stri`
`68`	`68`	`$this->assertEquals($header, $signedMessage->getHeaders()->get('DKIM-Signature')->getBody());`
`69`	`69`	`}`
`70`	`70`
`71`		`- public function getSignData()`
	`71`	`+ public static function getSignData()`
`72`	`72`	`{`
`73`	`73`	`yield 'simple/simple' => [`
`74`	`74`	`1591597074, DkimSigner::CANON_SIMPLE, DkimSigner::CANON_SIMPLE,`
`@@ -132,7 +132,7 @@ public function testCanonicalizeHeader(string $bodyCanon, string $canonBody, str`
`132`	`132`	`$this->assertEquals(\strlen($canonBody), $l);`
`133`	`133`	`}`
`134`	`134`
`135`		`- public function getCanonicalizeHeaderData()`
	`135`	`+ public static function getCanonicalizeHeaderData()`
`136`	`136`	`{`
`137`	`137`	`yield 'simple_empty' => [`
`138`	`138`	`DkimSigner::CANON_SIMPLE, "\r\n", '', \PHP_INT_MAX,`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function testToString($messageParameter)`
`29`	`29`	`$this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function provideMessages(): array`
	`32`	`+ public static function provideMessages(): array`
`33`	`33`	`{`
`34`	`34`	`return [`
`35`	`35`	`'string' => ['some string'],`