Merge branch '6.1' into 6.2

nicolas-grekas · nicolas-grekas · commit f2743e033dd0 · 2022-12-22T18:55:15.000+01:00
* 6.1:
  Fix integration test gha
  Update RedisTrait.php
  Use static methods inside data providers
  [VarExporter] Fix exporting classes with __unserialize() but not __serialize()
  [Validator] Fix IBAN format for Tunisia and Mauritania
  [Workflow] Allow spaces in place names so the PUML dump doesn't break
diff --git a/Tests/AbstractCrawlerTest.php b/Tests/AbstractCrawlerTest.php
@@ -19,7 +19,7 @@
 
 abstract class AbstractCrawlerTest extends TestCase
 {
-    abstract public function getDoctype(): string;
+    abstract public static function getDoctype(): string;
 
     protected function createCrawler($node = null, string $uri = null, string $baseHref = null)
     {
diff --git a/Tests/Html5ParserCrawlerTest.php b/Tests/Html5ParserCrawlerTest.php
@@ -13,7 +13,7 @@
 
 class Html5ParserCrawlerTest extends AbstractCrawlerTest
 {
-    public function getDoctype(): string
+    public static function getDoctype(): string
     {
         return '<!DOCTYPE html>';
     }
diff --git a/Tests/NativeParserCrawlerTest.php b/Tests/NativeParserCrawlerTest.php
@@ -13,7 +13,7 @@
 
 class NativeParserCrawlerTest extends AbstractCrawlerTest
 {
-    public function getDoctype(): string
+    public static function getDoctype(): string
     {
         return '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
     }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`abstract class AbstractCrawlerTest extends TestCase`
`21`	`21`	`{`
`22`		`- abstract public function getDoctype(): string;`
	`22`	`+ abstract public static function getDoctype(): string;`
`23`	`23`
`24`	`24`	`protected function createCrawler($node = null, string $uri = null, string $baseHref = null)`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`class Html5ParserCrawlerTest extends AbstractCrawlerTest`
`15`	`15`	`{`
`16`		`- public function getDoctype(): string`
	`16`	`+ public static function getDoctype(): string`
`17`	`17`	`{`
`18`	`18`	`return '<!DOCTYPE html>';`
`19`	`19`	`}`