Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 5564249f8691 · 2021-06-30T15:49:12.000+02:00
* 5.2:
  CS fix
  CS fix
  CS fixes
  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/Security/LdapBadge.php b/Security/LdapBadge.php
@@ -31,7 +31,7 @@ class LdapBadge implements BadgeInterface
     private $searchPassword;
     private $queryString;
 
-    public function __construct(string $ldapServiceId, string $dnString = '{username}', string $searchDn = '', string $searchPassword = '', ?string $queryString = null)
+    public function __construct(string $ldapServiceId, string $dnString = '{username}', string $searchDn = '', string $searchPassword = '', string $queryString = null)
     {
         $this->ldapServiceId = $ldapServiceId;
         $this->dnString = $dnString;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class LdapBadge implements BadgeInterface`
`31`	`31`	`private $searchPassword;`
`32`	`32`	`private $queryString;`
`33`	`33`
`34`		`- public function __construct(string $ldapServiceId, string $dnString = '{username}', string $searchDn = '', string $searchPassword = '', ?string $queryString = null)`
	`34`	`+ public function __construct(string $ldapServiceId, string $dnString = '{username}', string $searchDn = '', string $searchPassword = '', string $queryString = null)`
`35`	`35`	`{`
`36`	`36`	`$this->ldapServiceId = $ldapServiceId;`
`37`	`37`	`$this->dnString = $dnString;`