Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 9be46944359d · 2021-07-02T18:38:59.000+02:00
* 5.2:
  Backport type fixes
  Fix CS
  Avoid triggering the autoloader in Deprecation::isLegacy()
  fix markdown markup
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis
diff --git a/DependencyInjection/Security/Factory/JsonLoginFactory.php b/DependencyInjection/Security/Factory/JsonLoginFactory.php
@@ -75,7 +75,7 @@ protected function getListenerId()
     /**
      * {@inheritdoc}
      */
-    protected function isRememberMeAware($config)
+    protected function isRememberMeAware(array $config)
     {
         return false;
     }
diff --git a/Security/FirewallConfig.php b/Security/FirewallConfig.php
@@ -29,7 +29,7 @@ final class FirewallConfig
     private $listeners;
     private $switchUser;
 
-    public function __construct(string $name, string $userChecker, string $requestMatcher = null, bool $securityEnabled = true, bool $stateless = false, string $provider = null, string $context = null, string $entryPoint = null, string $accessDeniedHandler = null, string $accessDeniedUrl = null, array $listeners = [], $switchUser = null)
+    public function __construct(string $name, string $userChecker, string $requestMatcher = null, bool $securityEnabled = true, bool $stateless = false, string $provider = null, string $context = null, string $entryPoint = null, string $accessDeniedHandler = null, string $accessDeniedUrl = null, array $listeners = [], array $switchUser = null)
     {
         $this->name = $name;
         $this->userChecker = $userChecker;

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ protected function getListenerId()`
`75`	`75`	`/**`
`76`	`76`	`* {@inheritdoc}`
`77`	`77`	`*/`
`78`		`- protected function isRememberMeAware($config)`
	`78`	`+ protected function isRememberMeAware(array $config)`
`79`	`79`	`{`
`80`	`80`	`return false;`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ final class FirewallConfig`
`29`	`29`	`private $listeners;`
`30`	`30`	`private $switchUser;`
`31`	`31`
`32`		`- public function __construct(string $name, string $userChecker, string $requestMatcher = null, bool $securityEnabled = true, bool $stateless = false, string $provider = null, string $context = null, string $entryPoint = null, string $accessDeniedHandler = null, string $accessDeniedUrl = null, array $listeners = [], $switchUser = null)`
	`32`	`+ public function __construct(string $name, string $userChecker, string $requestMatcher = null, bool $securityEnabled = true, bool $stateless = false, string $provider = null, string $context = null, string $entryPoint = null, string $accessDeniedHandler = null, string $accessDeniedUrl = null, array $listeners = [], array $switchUser = null)`
`33`	`33`	`{`
`34`	`34`	`$this->name = $name;`
`35`	`35`	`$this->userChecker = $userChecker;`