Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 1b1ff95b7f9d · 2023-02-14T10:04:20.000+01:00
* 6.2:
  Fix merge
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/MockClockTest.php b/Tests/MockClockTest.php
@@ -63,7 +63,7 @@ public function testSleep()
         $this->assertSame($tz, $clock->now()->getTimezone()->getName());
     }
 
-    public function provideValidModifyStrings(): iterable
+    public static function provideValidModifyStrings(): iterable
     {
         yield 'absolute datetime value' => [
             '2112-09-17 23:53:03.001',
@@ -90,7 +90,7 @@ public function testModifyWithSpecificDateTime(string $modifiedNow, string $expe
         $this->assertSame($tz, $clock->now()->getTimezone()->getName());
     }
 
-    public function provideInvalidModifyStrings(): iterable
+    public static function provideInvalidModifyStrings(): iterable
     {
         yield 'Named holiday is not recognized' => [
             'Halloween',

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function testSleep()`
`63`	`63`	`$this->assertSame($tz, $clock->now()->getTimezone()->getName());`
`64`	`64`	`}`
`65`	`65`
`66`		`- public function provideValidModifyStrings(): iterable`
	`66`	`+ public static function provideValidModifyStrings(): iterable`
`67`	`67`	`{`
`68`	`68`	`yield 'absolute datetime value' => [`
`69`	`69`	`'2112-09-17 23:53:03.001',`
`@@ -90,7 +90,7 @@ public function testModifyWithSpecificDateTime(string $modifiedNow, string $expe`
`90`	`90`	`$this->assertSame($tz, $clock->now()->getTimezone()->getName());`
`91`	`91`	`}`
`92`	`92`
`93`		`- public function provideInvalidModifyStrings(): iterable`
	`93`	`+ public static function provideInvalidModifyStrings(): iterable`
`94`	`94`	`{`
`95`	`95`	`yield 'Named holiday is not recognized' => [`
`96`	`96`	`'Halloween',`