Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 7cfcb894229e · 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/Loader/Configurator/RoutingConfigurator.php b/Loader/Configurator/RoutingConfigurator.php
@@ -38,7 +38,7 @@ public function __construct(RouteCollection $collection, PhpFileLoader $loader,
     /**
      * @param string|string[]|null $exclude Glob patterns to exclude from the import
      */
-    final public function import(string|array $resource, string $type = null, bool $ignoreErrors = false, string|array|null $exclude = null): ImportConfigurator
+    final public function import(string|array $resource, string $type = null, bool $ignoreErrors = false, string|array $exclude = null): ImportConfigurator
     {
         $this->loader->setCurrentDir(\dirname($this->path));
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function __construct(RouteCollection $collection, PhpFileLoader $loader,`
`38`	`38`	`/**`
`39`	`39`	`* @param string\|string[]\|null $exclude Glob patterns to exclude from the import`
`40`	`40`	`*/`
`41`		`- final public function import(string\|array $resource, string $type = null, bool $ignoreErrors = false, string\|array\|null $exclude = null): ImportConfigurator`
	`41`	`+ final public function import(string\|array $resource, string $type = null, bool $ignoreErrors = false, string\|array $exclude = null): ImportConfigurator`
`42`	`42`	`{`
`43`	`43`	`$this->loader->setCurrentDir(\dirname($this->path));`
`44`	`44`