Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit c2b1444

Browse files
Merge branch '2.8' into 3.4
* 2.8: [php_cs] disable fopen_flags [CS] Remove unused variables passed to closures [CS] Remove empty comment [CS] Enforces null type hint on last position in phpDocs [CS] Use combined assignment operators when possible Fix a typo in error messages [Console] Add missing null to input values allowed types [PHPUnitBridge] Fix microtime() format bumped Symfony version to 2.8.47 update CONTRIBUTORS for 2.8.46 updated VERSION for 2.8.46 updated CHANGELOG for 2.8.46
2 parents 64517f4 + 762808a commit c2b1444

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Core/User/LdapUserProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ protected function loadUser($username, Entry $entry)
140140
/**
141141
* Fetches a required unique attribute value from an LDAP entry.
142142
*
143-
* @param null|Entry $entry
143+
* @param Entry|null $entry
144144
* @param string $attribute
145145
*/
146146
private function getAttributeValue(Entry $entry, $attribute)

Csrf/CsrfTokenManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class CsrfTokenManager implements CsrfTokenManagerInterface
3131
private $namespace;
3232

3333
/**
34-
* @param null|string|RequestStack|callable $namespace
34+
* @param string|RequestStack|callable|null $namespace
3535
* * null: generates a namespace using $_SERVER['HTTPS']
3636
* * string: uses the given string
3737
* * RequestStack: generates a namespace using the current master request

Guard/Firewall/GuardAuthenticationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorIn
9898
$request = $event->getRequest();
9999
try {
100100
if (null !== $this->logger) {
101-
$this->logger->debug('Calling getCredentials() on guard configurator.', array('firewall_key' => $this->providerKey, 'authenticator' => \get_class($guardAuthenticator)));
101+
$this->logger->debug('Calling getCredentials() on guard authenticator.', array('firewall_key' => $this->providerKey, 'authenticator' => \get_class($guardAuthenticator)));
102102
}
103103

104104
// abort the execution of the authenticator if it doesn't support the request

Guard/GuardAuthenticatorHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function authenticateWithToken(TokenInterface $token, Request $request/*,
7575
* @param AuthenticatorInterface $guardAuthenticator
7676
* @param string $providerKey The provider (i.e. firewall) key
7777
*
78-
* @return null|Response
78+
* @return Response|null
7979
*/
8080
public function handleAuthenticationSuccess(TokenInterface $token, Request $request, GuardAuthenticatorInterface $guardAuthenticator, $providerKey)
8181
{
@@ -120,7 +120,7 @@ public function authenticateUserAndHandleSuccess(UserInterface $user, Request $r
120120
* @param AuthenticatorInterface $guardAuthenticator
121121
* @param string $providerKey The key of the firewall
122122
*
123-
* @return null|Response
123+
* @return Response|null
124124
*/
125125
public function handleAuthenticationFailure(AuthenticationException $authenticationException, Request $request, GuardAuthenticatorInterface $guardAuthenticator, $providerKey)
126126
{

0 commit comments

Comments
 (0)