Merge branch '4.0' into 4.1

nicolas-grekas · nicolas-grekas · commit 8ace9c9d2363 · 2018-07-26T10:55:25.000+02:00
* 4.0:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer
diff --git a/Authentication/SimpleAuthenticationHandler.php b/Authentication/SimpleAuthenticationHandler.php
@@ -55,7 +55,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token)
     {
         if ($this->simpleAuthenticator instanceof AuthenticationSuccessHandlerInterface) {
             if ($this->logger) {
-                $this->logger->debug('Selected an authentication success handler.', array('handler' => get_class($this->simpleAuthenticator)));
+                $this->logger->debug('Selected an authentication success handler.', array('handler' => \get_class($this->simpleAuthenticator)));
             }
 
             $response = $this->simpleAuthenticator->onAuthenticationSuccess($request, $token);
@@ -64,7 +64,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token)
             }
 
             if (null !== $response) {
-                throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null to use the default success handler, or a Response object', get_class($this->simpleAuthenticator)));
+                throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null to use the default success handler, or a Response object', \get_class($this->simpleAuthenticator)));
             }
         }
 
@@ -82,7 +82,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
     {
         if ($this->simpleAuthenticator instanceof AuthenticationFailureHandlerInterface) {
             if ($this->logger) {
-                $this->logger->debug('Selected an authentication failure handler.', array('handler' => get_class($this->simpleAuthenticator)));
+                $this->logger->debug('Selected an authentication failure handler.', array('handler' => \get_class($this->simpleAuthenticator)));
             }
 
             $response = $this->simpleAuthenticator->onAuthenticationFailure($request, $exception);
@@ -91,7 +91,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
             }
 
             if (null !== $response) {
-                throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null to use the default failure handler, or a Response object', get_class($this->simpleAuthenticator)));
+                throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null to use the default failure handler, or a Response object', \get_class($this->simpleAuthenticator)));
             }
         }
 
diff --git a/Firewall/ContextListener.php b/Firewall/ContextListener.php
@@ -97,7 +97,7 @@ public function handle(GetResponseEvent $event)
         if (null !== $this->logger) {
             $this->logger->debug('Read existing security token from the session.', array(
                 'key' => $this->sessionKey,
-                'token_class' => is_object($token) ? get_class($token) : null,
+                'token_class' => \is_object($token) ? \get_class($token) : null,
             ));
         }
 
@@ -164,7 +164,7 @@ protected function refreshUser(TokenInterface $token)
 
         foreach ($this->userProviders as $provider) {
             if (!$provider instanceof UserProviderInterface) {
-                throw new \InvalidArgumentException(sprintf('User provider "%s" must implement "%s".', get_class($provider), UserProviderInterface::class));
+                throw new \InvalidArgumentException(sprintf('User provider "%s" must implement "%s".', \get_class($provider), UserProviderInterface::class));
             }
 
             try {
@@ -174,14 +174,14 @@ protected function refreshUser(TokenInterface $token)
                 // tokens can be deauthenticated if the user has been changed.
                 if (!$token->isAuthenticated()) {
                     if (null !== $this->logger) {
-                        $this->logger->debug('Token was deauthenticated after trying to refresh it.', array('username' => $refreshedUser->getUsername(), 'provider' => get_class($provider)));
+                        $this->logger->debug('Token was deauthenticated after trying to refresh it.', array('username' => $refreshedUser->getUsername(), 'provider' => \get_class($provider)));
                     }
 
                     return null;
                 }
 
                 if (null !== $this->logger) {
-                    $context = array('provider' => get_class($provider), 'username' => $refreshedUser->getUsername());
+                    $context = array('provider' => \get_class($provider), 'username' => $refreshedUser->getUsername());
 
                     foreach ($token->getRoles() as $role) {
                         if ($role instanceof SwitchUserRole) {
@@ -198,7 +198,7 @@ protected function refreshUser(TokenInterface $token)
                 // let's try the next user provider
             } catch (UsernameNotFoundException $e) {
                 if (null !== $this->logger) {
-                    $this->logger->warning('Username could not be found in the selected user provider.', array('username' => $e->getUsername(), 'provider' => get_class($provider)));
+                    $this->logger->warning('Username could not be found in the selected user provider.', array('username' => $e->getUsername(), 'provider' => \get_class($provider)));
                 }
 
                 $userNotFoundByProvider = true;
@@ -209,7 +209,7 @@ protected function refreshUser(TokenInterface $token)
             return null;
         }
 
-        throw new \RuntimeException(sprintf('There is no user provider for user "%s".', get_class($user)));
+        throw new \RuntimeException(sprintf('There is no user provider for user "%s".', \get_class($user)));
     }
 
     private function safelyUnserialize($serializedToken)
diff --git a/Firewall/ExceptionListener.php b/Firewall/ExceptionListener.php
@@ -194,9 +194,9 @@ private function startAuthentication(Request $request, AuthenticationException $
         $response = $this->authenticationEntryPoint->start($request, $authException);
 
         if (!$response instanceof Response) {
-            $given = is_object($response) ? get_class($response) : gettype($response);
+            $given = \is_object($response) ? \get_class($response) : \gettype($response);
 
-            throw new \LogicException(sprintf('The %s::start() method must return a Response object (%s returned)', get_class($this->authenticationEntryPoint), $given));
+            throw new \LogicException(sprintf('The %s::start() method must return a Response object (%s returned)', \get_class($this->authenticationEntryPoint), $given));
         }
 
         return $response;
diff --git a/Firewall/SimplePreAuthenticationListener.php b/Firewall/SimplePreAuthenticationListener.php
@@ -75,7 +75,7 @@ public function handle(GetResponseEvent $event)
         $request = $event->getRequest();
 
         if (null !== $this->logger) {
-            $this->logger->info('Attempting SimplePreAuthentication.', array('key' => $this->providerKey, 'authenticator' => get_class($this->simpleAuthenticator)));
+            $this->logger->info('Attempting SimplePreAuthentication.', array('key' => $this->providerKey, 'authenticator' => \get_class($this->simpleAuthenticator)));
         }
 
         if (null !== $this->tokenStorage->getToken() && !$this->tokenStorage->getToken() instanceof AnonymousToken) {
@@ -104,15 +104,15 @@ public function handle(GetResponseEvent $event)
             $this->tokenStorage->setToken(null);
 
             if (null !== $this->logger) {
-                $this->logger->info('SimplePreAuthentication request failed.', array('exception' => $e, 'authenticator' => get_class($this->simpleAuthenticator)));
+                $this->logger->info('SimplePreAuthentication request failed.', array('exception' => $e, 'authenticator' => \get_class($this->simpleAuthenticator)));
             }
 
             if ($this->simpleAuthenticator instanceof AuthenticationFailureHandlerInterface) {
                 $response = $this->simpleAuthenticator->onAuthenticationFailure($request, $e);
                 if ($response instanceof Response) {
                     $event->setResponse($response);
                 } elseif (null !== $response) {
-                    throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null or a Response object', get_class($this->simpleAuthenticator)));
+                    throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null or a Response object', \get_class($this->simpleAuthenticator)));
                 }
             }
 
@@ -124,7 +124,7 @@ public function handle(GetResponseEvent $event)
             if ($response instanceof Response) {
                 $event->setResponse($response);
             } elseif (null !== $response) {
-                throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null or a Response object', get_class($this->simpleAuthenticator)));
+                throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null or a Response object', \get_class($this->simpleAuthenticator)));
             }
         }
     }
diff --git a/Firewall/UsernamePasswordFormAuthenticationListener.php b/Firewall/UsernamePasswordFormAuthenticationListener.php
@@ -91,7 +91,7 @@ protected function attemptAuthentication(Request $request)
 
         $username = trim($username);
 
-        if (strlen($username) > Security::MAX_USERNAME_LENGTH) {
+        if (\strlen($username) > Security::MAX_USERNAME_LENGTH) {
             throw new BadCredentialsException('Invalid username.');
         }
 
diff --git a/Firewall/UsernamePasswordJsonAuthenticationListener.php b/Firewall/UsernamePasswordJsonAuthenticationListener.php
@@ -104,15 +104,15 @@ public function handle(GetResponseEvent $event)
                 throw new BadRequestHttpException(sprintf('The key "%s" must be provided.', $this->options['password_path']), $e);
             }
 
-            if (!is_string($username)) {
+            if (!\is_string($username)) {
                 throw new BadRequestHttpException(sprintf('The key "%s" must be a string.', $this->options['username_path']));
             }
 
-            if (strlen($username) > Security::MAX_USERNAME_LENGTH) {
+            if (\strlen($username) > Security::MAX_USERNAME_LENGTH) {
                 throw new BadCredentialsException('Invalid username.');
             }
 
-            if (!is_string($password)) {
+            if (!\is_string($password)) {
                 throw new BadRequestHttpException(sprintf('The key "%s" must be a string.', $this->options['password_path']));
             }
 
diff --git a/RememberMe/AbstractRememberMeServices.php b/RememberMe/AbstractRememberMeServices.php
@@ -54,7 +54,7 @@ public function __construct(array $userProviders, string $secret, string $provid
         if (empty($providerKey)) {
             throw new \InvalidArgumentException('$providerKey must not be empty.');
         }
-        if (0 === count($userProviders)) {
+        if (0 === \count($userProviders)) {
             throw new \InvalidArgumentException('You must provide at least one user provider.');
         }
 
diff --git a/RememberMe/PersistentTokenBasedRememberMeServices.php b/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -47,7 +47,7 @@ protected function cancelCookie(Request $request)
 
         // Delete cookie from the tokenProvider
         if (null !== ($cookie = $request->cookies->get($this->options['name']))
-            && 2 === count($parts = $this->decodeCookie($cookie))
+            && 2 === \count($parts = $this->decodeCookie($cookie))
         ) {
             list($series) = $parts;
             $this->tokenProvider->deleteTokenBySeries($series);
@@ -59,7 +59,7 @@ protected function cancelCookie(Request $request)
      */
     protected function processAutoLoginCookie(array $cookieParts, Request $request)
     {
-        if (2 !== count($cookieParts)) {
+        if (2 !== \count($cookieParts)) {
             throw new AuthenticationException('The cookie is invalid.');
         }
 
@@ -101,7 +101,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
 
         $this->tokenProvider->createNewToken(
             new PersistentToken(
-                get_class($user = $token->getUser()),
+                \get_class($user = $token->getUser()),
                 $user->getUsername(),
                 $series,
                 $tokenValue,
diff --git a/RememberMe/TokenBasedRememberMeServices.php b/RememberMe/TokenBasedRememberMeServices.php
@@ -31,7 +31,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
      */
     protected function processAutoLoginCookie(array $cookieParts, Request $request)
     {
-        if (4 !== count($cookieParts)) {
+        if (4 !== \count($cookieParts)) {
             throw new AuthenticationException('The cookie is invalid.');
         }
 
@@ -50,7 +50,7 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request)
         }
 
         if (!$user instanceof UserInterface) {
-            throw new \RuntimeException(sprintf('The UserProviderInterface implementation must return an instance of UserInterface, but returned "%s".', get_class($user)));
+            throw new \RuntimeException(sprintf('The UserProviderInterface implementation must return an instance of UserInterface, but returned "%s".', \get_class($user)));
         }
 
         if (true !== hash_equals($this->generateCookieHash($class, $username, $expires, $user->getPassword()), $hash)) {
@@ -71,7 +71,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
     {
         $user = $token->getUser();
         $expires = time() + $this->options['lifetime'];
-        $value = $this->generateCookieValue(get_class($user), $user->getUsername(), $expires, $user->getPassword());
+        $value = $this->generateCookieValue(\get_class($user), $user->getUsername(), $expires, $user->getPassword());
 
         $response->headers->setCookie(
             new Cookie(
diff --git a/Tests/Controller/UserValueResolverTest.php b/Tests/Controller/UserValueResolverTest.php
@@ -40,7 +40,7 @@ public function testResolveNoUser()
         $tokenStorage->setToken($token);
 
         $resolver = new UserValueResolver($tokenStorage);
-        $metadata = new ArgumentMetadata('foo', get_class($mock), false, false, null);
+        $metadata = new ArgumentMetadata('foo', \get_class($mock), false, false, null);
 
         $this->assertFalse($resolver->supports(Request::create('/'), $metadata));
     }
diff --git a/Tests/RememberMe/AbstractRememberMeServicesTest.php b/Tests/RememberMe/AbstractRememberMeServicesTest.php
@@ -304,7 +304,7 @@ protected function getProvider()
 
     private function callProtected($object, $method, array $args)
     {
-        $reflection = new \ReflectionClass(get_class($object));
+        $reflection = new \ReflectionClass(\get_class($object));
         $reflectionMethod = $reflection->getMethod($method);
         $reflectionMethod->setAccessible(true);
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token)`
`55`	`55`	`{`
`56`	`56`	`if ($this->simpleAuthenticator instanceof AuthenticationSuccessHandlerInterface) {`
`57`	`57`	`if ($this->logger) {`
`58`		`- $this->logger->debug('Selected an authentication success handler.', array('handler' => get_class($this->simpleAuthenticator)));`
	`58`	`+ $this->logger->debug('Selected an authentication success handler.', array('handler' => \get_class($this->simpleAuthenticator)));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`$response = $this->simpleAuthenticator->onAuthenticationSuccess($request, $token);`
`@@ -64,7 +64,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if (null !== $response) {`
`67`		`- throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null to use the default success handler, or a Response object', get_class($this->simpleAuthenticator)));`
	`67`	`+ throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null to use the default success handler, or a Response object', \get_class($this->simpleAuthenticator)));`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`@@ -82,7 +82,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio`
`82`	`82`	`{`
`83`	`83`	`if ($this->simpleAuthenticator instanceof AuthenticationFailureHandlerInterface) {`
`84`	`84`	`if ($this->logger) {`
`85`		`- $this->logger->debug('Selected an authentication failure handler.', array('handler' => get_class($this->simpleAuthenticator)));`
	`85`	`+ $this->logger->debug('Selected an authentication failure handler.', array('handler' => \get_class($this->simpleAuthenticator)));`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`$response = $this->simpleAuthenticator->onAuthenticationFailure($request, $exception);`
`@@ -91,7 +91,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`if (null !== $response) {`
`94`		`- throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null to use the default failure handler, or a Response object', get_class($this->simpleAuthenticator)));`
	`94`	`+ throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null to use the default failure handler, or a Response object', \get_class($this->simpleAuthenticator)));`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,9 @@ private function startAuthentication(Request $request, AuthenticationException $`
`194`	`194`	`$response = $this->authenticationEntryPoint->start($request, $authException);`
`195`	`195`
`196`	`196`	`if (!$response instanceof Response) {`
`197`		`- $given = is_object($response) ? get_class($response) : gettype($response);`
	`197`	`+ $given = \is_object($response) ? \get_class($response) : \gettype($response);`
`198`	`198`
`199`		`- throw new \LogicException(sprintf('The %s::start() method must return a Response object (%s returned)', get_class($this->authenticationEntryPoint), $given));`
	`199`	`+ throw new \LogicException(sprintf('The %s::start() method must return a Response object (%s returned)', \get_class($this->authenticationEntryPoint), $given));`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`return $response;`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function handle(GetResponseEvent $event)`
`75`	`75`	`$request = $event->getRequest();`
`76`	`76`
`77`	`77`	`if (null !== $this->logger) {`
`78`		`- $this->logger->info('Attempting SimplePreAuthentication.', array('key' => $this->providerKey, 'authenticator' => get_class($this->simpleAuthenticator)));`
	`78`	`+ $this->logger->info('Attempting SimplePreAuthentication.', array('key' => $this->providerKey, 'authenticator' => \get_class($this->simpleAuthenticator)));`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if (null !== $this->tokenStorage->getToken() && !$this->tokenStorage->getToken() instanceof AnonymousToken) {`
`@@ -104,15 +104,15 @@ public function handle(GetResponseEvent $event)`
`104`	`104`	`$this->tokenStorage->setToken(null);`
`105`	`105`
`106`	`106`	`if (null !== $this->logger) {`
`107`		`- $this->logger->info('SimplePreAuthentication request failed.', array('exception' => $e, 'authenticator' => get_class($this->simpleAuthenticator)));`
	`107`	`+ $this->logger->info('SimplePreAuthentication request failed.', array('exception' => $e, 'authenticator' => \get_class($this->simpleAuthenticator)));`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`if ($this->simpleAuthenticator instanceof AuthenticationFailureHandlerInterface) {`
`111`	`111`	`$response = $this->simpleAuthenticator->onAuthenticationFailure($request, $e);`
`112`	`112`	`if ($response instanceof Response) {`
`113`	`113`	`$event->setResponse($response);`
`114`	`114`	`} elseif (null !== $response) {`
`115`		`- throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null or a Response object', get_class($this->simpleAuthenticator)));`
	`115`	`+ throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null or a Response object', \get_class($this->simpleAuthenticator)));`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`@@ -124,7 +124,7 @@ public function handle(GetResponseEvent $event)`
`124`	`124`	`if ($response instanceof Response) {`
`125`	`125`	`$event->setResponse($response);`
`126`	`126`	`} elseif (null !== $response) {`
`127`		`- throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null or a Response object', get_class($this->simpleAuthenticator)));`
	`127`	`+ throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null or a Response object', \get_class($this->simpleAuthenticator)));`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ protected function attemptAuthentication(Request $request)`
`91`	`91`
`92`	`92`	`$username = trim($username);`
`93`	`93`
`94`		`- if (strlen($username) > Security::MAX_USERNAME_LENGTH) {`
	`94`	`+ if (\strlen($username) > Security::MAX_USERNAME_LENGTH) {`
`95`	`95`	`throw new BadCredentialsException('Invalid username.');`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function __construct(array $userProviders, string $secret, string $provid`
`54`	`54`	`if (empty($providerKey)) {`
`55`	`55`	`throw new \InvalidArgumentException('$providerKey must not be empty.');`
`56`	`56`	`}`
`57`		`- if (0 === count($userProviders)) {`
	`57`	`+ if (0 === \count($userProviders)) {`
`58`	`58`	`throw new \InvalidArgumentException('You must provide at least one user provider.');`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices`
`31`	`31`	`*/`
`32`	`32`	`protected function processAutoLoginCookie(array $cookieParts, Request $request)`
`33`	`33`	`{`
`34`		`- if (4 !== count($cookieParts)) {`
	`34`	`+ if (4 !== \count($cookieParts)) {`
`35`	`35`	`throw new AuthenticationException('The cookie is invalid.');`
`36`	`36`	`}`
`37`	`37`
`@@ -50,7 +50,7 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request)`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if (!$user instanceof UserInterface) {`
`53`		`- throw new \RuntimeException(sprintf('The UserProviderInterface implementation must return an instance of UserInterface, but returned "%s".', get_class($user)));`
	`53`	`+ throw new \RuntimeException(sprintf('The UserProviderInterface implementation must return an instance of UserInterface, but returned "%s".', \get_class($user)));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if (true !== hash_equals($this->generateCookieHash($class, $username, $expires, $user->getPassword()), $hash)) {`
`@@ -71,7 +71,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt`
`71`	`71`	`{`
`72`	`72`	`$user = $token->getUser();`
`73`	`73`	`$expires = time() + $this->options['lifetime'];`
`74`		`- $value = $this->generateCookieValue(get_class($user), $user->getUsername(), $expires, $user->getPassword());`
	`74`	`+ $value = $this->generateCookieValue(\get_class($user), $user->getUsername(), $expires, $user->getPassword());`
`75`	`75`
`76`	`76`	`$response->headers->setCookie(`
`77`	`77`	`new Cookie(`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function testResolveNoUser()`
`40`	`40`	`$tokenStorage->setToken($token);`
`41`	`41`
`42`	`42`	`$resolver = new UserValueResolver($tokenStorage);`
`43`		`- $metadata = new ArgumentMetadata('foo', get_class($mock), false, false, null);`
	`43`	`+ $metadata = new ArgumentMetadata('foo', \get_class($mock), false, false, null);`
`44`	`44`
`45`	`45`	`$this->assertFalse($resolver->supports(Request::create('/'), $metadata));`
`46`	`46`	`}`