Fix merge

nicolas-grekas · nicolas-grekas · commit d7459121033d · 2023-02-14T09:53:37.000+01:00
diff --git a/Tests/Slugger/AsciiSluggerTest.php b/Tests/Slugger/AsciiSluggerTest.php
@@ -26,7 +26,7 @@ public function testSlug(string $expected, string $string, string $separator = '
         $this->assertSame($expected, (string) $slugger->slug($string, $separator, $locale));
     }
 
-    public function provideSlugTests(): iterable
+    public static function provideSlugTests(): iterable
     {
         yield ['', ''];
         yield ['foo', ' foo '];
@@ -60,7 +60,7 @@ public function testSlugEmoji(string $expected, string $string, ?string $locale,
         $this->assertSame($expected, (string) $slugger->slug($string, '-', $locale));
     }
 
-    public function provideSlugEmojiTests(): iterable
+    public static function provideSlugEmojiTests(): iterable
     {
         yield [
             'un-chat-qui-sourit-chat-noir-et-un-tete-de-lion-vont-au-parc-national',

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function testSlug(string $expected, string $string, string $separator = '`
`26`	`26`	`$this->assertSame($expected, (string) $slugger->slug($string, $separator, $locale));`
`27`	`27`	`}`
`28`	`28`
`29`		`- public function provideSlugTests(): iterable`
	`29`	`+ public static function provideSlugTests(): iterable`
`30`	`30`	`{`
`31`	`31`	`yield ['', ''];`
`32`	`32`	`yield ['foo', ' foo '];`
`@@ -60,7 +60,7 @@ public function testSlugEmoji(string $expected, string $string, ?string $locale,`
`60`	`60`	`$this->assertSame($expected, (string) $slugger->slug($string, '-', $locale));`
`61`	`61`	`}`
`62`	`62`
`63`		`- public function provideSlugEmojiTests(): iterable`
	`63`	`+ public static function provideSlugEmojiTests(): iterable`
`64`	`64`	`{`
`65`	`65`	`yield [`
`66`	`66`	`'un-chat-qui-sourit-chat-noir-et-un-tete-de-lion-vont-au-parc-national',`