minor #32942 [Ldap] Fix LdapUserProvider signatures (chalasr)

Robin Chalas · Robin Chalas · commit fc6d6c90541c · 2019-08-05T14:01:25.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [Ldap] Fix LdapUserProvider signatures | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 920a52d [Ldap] Fix signature compat
diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php
@@ -63,7 +63,7 @@ public function __construct(LdapInterface $ldap, string $baseDn, string $searchD
     /**
      * {@inheritdoc}
      */
-    public function loadUserByUsername($username)
+    public function loadUserByUsername(string $username)
     {
         try {
             $this->ldap->bind($this->searchDn, $this->searchPassword);
@@ -112,7 +112,7 @@ public function refreshUser(UserInterface $user)
     /**
      * {@inheritdoc}
      */
-    public function supportsClass($class)
+    public function supportsClass(string $class)
     {
         return LdapUser::class === $class;
     }
diff --git a/src/Symfony/Component/Ldap/composer.json b/src/Symfony/Component/Ldap/composer.json
@@ -21,10 +21,11 @@
         "ext-ldap": "*"
     },
     "require-dev": {
-        "symfony/security-core": "^4.4"
+        "symfony/security-core": "^5.0"
     },
     "conflict": {
-        "symfony/options-resolver": "<4.4"
+        "symfony/options-resolver": "<4.4",
+        "symfony/security-core": "<5"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Ldap\\": "" },

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function __construct(LdapInterface $ldap, string $baseDn, string $searchD`
`63`	`63`	`/**`
`64`	`64`	`* {@inheritdoc}`
`65`	`65`	`*/`
`66`		`- public function loadUserByUsername($username)`
	`66`	`+ public function loadUserByUsername(string $username)`
`67`	`67`	`{`
`68`	`68`	`try {`
`69`	`69`	`$this->ldap->bind($this->searchDn, $this->searchPassword);`
`@@ -112,7 +112,7 @@ public function refreshUser(UserInterface $user)`
`112`	`112`	`/**`
`113`	`113`	`* {@inheritdoc}`
`114`	`114`	`*/`
`115`		`- public function supportsClass($class)`
	`115`	`+ public function supportsClass(string $class)`
`116`	`116`	`{`
`117`	`117`	`return LdapUser::class === $class;`
`118`	`118`	`}`