Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 3d3f1f418907 · 2023-02-14T10:04:20.000+01:00
* 6.2:
  Fix merge
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/AbstractCrawlerTestCase.php b/Tests/AbstractCrawlerTestCase.php
@@ -344,7 +344,7 @@ public function testText()
         $this->assertSame('my value', $this->createTestCrawler(null)->filterXPath('//ol')->text('my value'));
     }
 
-    public function provideInnerTextExamples()
+    public static function provideInnerTextExamples()
     {
         return [
             [
@@ -942,7 +942,7 @@ public function testSiblings()
         }
     }
 
-    public function provideMatchTests()
+    public static function provideMatchTests()
     {
         yield ['#foo', true, '#foo'];
         yield ['#foo', true, '.foo'];
@@ -1165,7 +1165,7 @@ public function testBaseTag($baseValue, $linkValue, $expectedUri, $currentUri =
         $this->assertEquals($expectedUri, $crawler->filterXPath('//a')->link()->getUri(), $description);
     }
 
-    public function getBaseTagData()
+    public static function getBaseTagData()
     {
         return [
             ['http://base.com', 'link', 'http://base.com/link'],
@@ -1185,7 +1185,7 @@ public function testBaseTagWithForm($baseValue, $actionValue, $expectedUri, $cur
         $this->assertEquals($expectedUri, $crawler->filterXPath('//button')->form()->getUri(), $description);
     }
 
-    public function getBaseTagWithFormData()
+    public static function getBaseTagWithFormData()
     {
         return [
             ['https://base.com/', 'link/', 'https://base.com/link/', 'https://base.com/link/', '<base> tag does work with a path and relative form action'],
diff --git a/Tests/Field/FileFormFieldTest.php b/Tests/Field/FileFormFieldTest.php
@@ -78,7 +78,7 @@ public function testSetValue($method)
         );
     }
 
-    public function getSetValueMethods()
+    public static function getSetValueMethods()
     {
         return [
             ['setValue'],
diff --git a/Tests/FormTest.php b/Tests/FormTest.php
@@ -78,7 +78,7 @@ public function testConstructorThrowsExceptionIfNoRelatedForm(\DOMElement $node)
         new Form($node, 'http://example.com');
     }
 
-    public function constructorThrowsExceptionIfNoRelatedFormProvider()
+    public static function constructorThrowsExceptionIfNoRelatedFormProvider()
     {
         $dom = new \DOMDocument();
         $dom->loadHTML('
@@ -217,7 +217,7 @@ function ($field) {
         );
     }
 
-    public function provideInitializeValues()
+    public static function provideInitializeValues()
     {
         return [
             [
@@ -585,7 +585,7 @@ public function testGetUriWithActionOverride()
         $this->assertEquals('http://localhost/bar', $form->getUri(), '->getUri() returns absolute URIs');
     }
 
-    public function provideGetUriValues()
+    public static function provideGetUriValues()
     {
         return [
             [
diff --git a/Tests/Html5ParserCrawlerTest.php b/Tests/Html5ParserCrawlerTest.php
@@ -46,7 +46,7 @@ public function testHtml5ParserWithInvalidHeadedContent(string $content)
         self::assertEmpty($crawler->filterXPath('//h1')->text(), '->addHtmlContent failed as expected');
     }
 
-    public function validHtml5Provider(): iterable
+    public static function validHtml5Provider(): iterable
     {
         $html = self::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
         $BOM = \chr(0xEF).\chr(0xBB).\chr(0xBF);
@@ -59,7 +59,7 @@ public function validHtml5Provider(): iterable
         yield 'All together' => [$BOM.'  <!--c-->'.$html];
     }
 
-    public function invalidHtml5Provider(): iterable
+    public static function invalidHtml5Provider(): iterable
     {
         $html = self::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
 
diff --git a/Tests/ImageTest.php b/Tests/ImageTest.php
@@ -56,7 +56,7 @@ public function testGetUri($url, $currentUri, $expected)
         $this->assertEquals($expected, $image->getUri());
     }
 
-    public function getGetUriTests()
+    public static function getGetUriTests()
     {
         return [
             ['/foo.png', 'http://localhost/bar/foo/', 'http://localhost/foo.png'],
diff --git a/Tests/LinkTest.php b/Tests/LinkTest.php
@@ -105,7 +105,7 @@ public function testGetUriOnLink($url, $currentUri, $expected)
         $this->assertEquals($expected, $link->getUri());
     }
 
-    public function getGetUriTests()
+    public static function getGetUriTests()
     {
         return [
             ['/foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],
diff --git a/Tests/UriResolverTest.php b/Tests/UriResolverTest.php
@@ -24,7 +24,7 @@ public function testResolver(string $uri, string $baseUri, string $expected)
         $this->assertEquals($expected, UriResolver::resolve($uri, $baseUri));
     }
 
-    public function provideResolverTests()
+    public static function provideResolverTests()
     {
         return [
             ['/foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ public function testText()`
`344`	`344`	`$this->assertSame('my value', $this->createTestCrawler(null)->filterXPath('//ol')->text('my value'));`
`345`	`345`	`}`
`346`	`346`
`347`		`- public function provideInnerTextExamples()`
	`347`	`+ public static function provideInnerTextExamples()`
`348`	`348`	`{`
`349`	`349`	`return [`
`350`	`350`	`[`
`@@ -942,7 +942,7 @@ public function testSiblings()`
`942`	`942`	`}`
`943`	`943`	`}`
`944`	`944`
`945`		`- public function provideMatchTests()`
	`945`	`+ public static function provideMatchTests()`
`946`	`946`	`{`
`947`	`947`	`yield ['#foo', true, '#foo'];`
`948`	`948`	`yield ['#foo', true, '.foo'];`
`@@ -1165,7 +1165,7 @@ public function testBaseTag($baseValue, $linkValue, $expectedUri, $currentUri =`
`1165`	`1165`	`$this->assertEquals($expectedUri, $crawler->filterXPath('//a')->link()->getUri(), $description);`
`1166`	`1166`	`}`
`1167`	`1167`
`1168`		`- public function getBaseTagData()`
	`1168`	`+ public static function getBaseTagData()`
`1169`	`1169`	`{`
`1170`	`1170`	`return [`
`1171`	`1171`	`['http://base.com', 'link', 'http://base.com/link'],`
`@@ -1185,7 +1185,7 @@ public function testBaseTagWithForm($baseValue, $actionValue, $expectedUri, $cur`
`1185`	`1185`	`$this->assertEquals($expectedUri, $crawler->filterXPath('//button')->form()->getUri(), $description);`
`1186`	`1186`	`}`
`1187`	`1187`
`1188`		`- public function getBaseTagWithFormData()`
	`1188`	`+ public static function getBaseTagWithFormData()`
`1189`	`1189`	`{`
`1190`	`1190`	`return [`
`1191`	`1191`	`['https://base.com/', 'link/', 'https://base.com/link/', 'https://base.com/link/', '<base> tag does work with a path and relative form action'],`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function testSetValue($method)`
`78`	`78`	`);`
`79`	`79`	`}`
`80`	`80`
`81`		`- public function getSetValueMethods()`
	`81`	`+ public static function getSetValueMethods()`
`82`	`82`	`{`
`83`	`83`	`return [`
`84`	`84`	`['setValue'],`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function testConstructorThrowsExceptionIfNoRelatedForm(\DOMElement $node)`
`78`	`78`	`new Form($node, 'http://example.com');`
`79`	`79`	`}`
`80`	`80`
`81`		`- public function constructorThrowsExceptionIfNoRelatedFormProvider()`
	`81`	`+ public static function constructorThrowsExceptionIfNoRelatedFormProvider()`
`82`	`82`	`{`
`83`	`83`	`$dom = new \DOMDocument();`
`84`	`84`	`$dom->loadHTML('`
`@@ -217,7 +217,7 @@ function ($field) {`
`217`	`217`	`);`
`218`	`218`	`}`
`219`	`219`
`220`		`- public function provideInitializeValues()`
	`220`	`+ public static function provideInitializeValues()`
`221`	`221`	`{`
`222`	`222`	`return [`
`223`	`223`	`[`
`@@ -585,7 +585,7 @@ public function testGetUriWithActionOverride()`
`585`	`585`	`$this->assertEquals('http://localhost/bar', $form->getUri(), '->getUri() returns absolute URIs');`
`586`	`586`	`}`
`587`	`587`
`588`		`- public function provideGetUriValues()`
	`588`	`+ public static function provideGetUriValues()`
`589`	`589`	`{`
`590`	`590`	`return [`
`591`	`591`	`[`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function testHtml5ParserWithInvalidHeadedContent(string $content)`
`46`	`46`	`self::assertEmpty($crawler->filterXPath('//h1')->text(), '->addHtmlContent failed as expected');`
`47`	`47`	`}`
`48`	`48`
`49`		`- public function validHtml5Provider(): iterable`
	`49`	`+ public static function validHtml5Provider(): iterable`
`50`	`50`	`{`
`51`	`51`	`$html = self::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';`
`52`	`52`	`$BOM = \chr(0xEF).\chr(0xBB).\chr(0xBF);`
`@@ -59,7 +59,7 @@ public function validHtml5Provider(): iterable`
`59`	`59`	`yield 'All together' => [$BOM.' <!--c-->'.$html];`
`60`	`60`	`}`
`61`	`61`
`62`		`- public function invalidHtml5Provider(): iterable`
	`62`	`+ public static function invalidHtml5Provider(): iterable`
`63`	`63`	`{`
`64`	`64`	`$html = self::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function testGetUri($url, $currentUri, $expected)`
`56`	`56`	`$this->assertEquals($expected, $image->getUri());`
`57`	`57`	`}`
`58`	`58`
`59`		`- public function getGetUriTests()`
	`59`	`+ public static function getGetUriTests()`
`60`	`60`	`{`
`61`	`61`	`return [`
`62`	`62`	`['/foo.png', 'http://localhost/bar/foo/', 'http://localhost/foo.png'],`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function testGetUriOnLink($url, $currentUri, $expected)`
`105`	`105`	`$this->assertEquals($expected, $link->getUri());`
`106`	`106`	`}`
`107`	`107`
`108`		`- public function getGetUriTests()`
	`108`	`+ public static function getGetUriTests()`
`109`	`109`	`{`
`110`	`110`	`return [`
`111`	`111`	`['/foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function testResolver(string $uri, string $baseUri, string $expected)`
`24`	`24`	`$this->assertEquals($expected, UriResolver::resolve($uri, $baseUri));`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function provideResolverTests()`
	`27`	`+ public static function provideResolverTests()`
`28`	`28`	`{`
`29`	`29`	`return [`
`30`	`30`	`['/foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],`