Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit cd924785eb9e · 2021-06-30T16:18:39.000+02:00
* 5.4:
  Fix tests
  CS fix
  CS fix
  CS fix
  CS fixes
  Bump Symfony version to 5.3.4
  Update VERSION for 5.3.3
  Update CHANGELOG for 5.3.3
  Bump Symfony version to 5.2.12
  Update VERSION for 5.2.11
  Update CHANGELOG for 5.2.11
  Bump Symfony version to 4.4.27
  Update VERSION for 4.4.26
  Update CONTRIBUTORS for 4.4.26
  Update CHANGELOG for 4.4.26
diff --git a/Slugger/AsciiSlugger.php b/Slugger/AsciiSlugger.php
@@ -66,7 +66,7 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface
      */
     private $transliterators = [];
 
-    public function __construct(string $defaultLocale = null, array|\Closure|null $symbolsMap = null)
+    public function __construct(string $defaultLocale = null, array|\Closure $symbolsMap = null)
     {
         $this->defaultLocale = $defaultLocale;
         $this->symbolsMap = $symbolsMap ?? $this->symbolsMap;

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface`
`66`	`66`	`*/`
`67`	`67`	`private $transliterators = [];`
`68`	`68`
`69`		`- public function __construct(string $defaultLocale = null, array\|\Closure\|null $symbolsMap = null)`
	`69`	`+ public function __construct(string $defaultLocale = null, array\|\Closure $symbolsMap = null)`
`70`	`70`	`{`
`71`	`71`	`$this->defaultLocale = $defaultLocale;`
`72`	`72`	`$this->symbolsMap = $symbolsMap ?? $this->symbolsMap;`