Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 1b6a0e54fc40 · 2018-07-26T10:45:46.000+02:00
* 2.8:
  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/AuthenticationProviderManager.php b/Authentication/AuthenticationProviderManager.php
@@ -65,7 +65,7 @@ public function authenticate(TokenInterface $token)
 
         foreach ($this->providers as $provider) {
             if (!$provider instanceof AuthenticationProviderInterface) {
-                throw new \InvalidArgumentException(sprintf('Provider "%s" must implement the AuthenticationProviderInterface.', get_class($provider)));
+                throw new \InvalidArgumentException(sprintf('Provider "%s" must implement the AuthenticationProviderInterface.', \get_class($provider)));
             }
 
             if (!$provider->supports($token)) {
@@ -100,7 +100,7 @@ public function authenticate(TokenInterface $token)
         }
 
         if (null === $lastException) {
-            $lastException = new ProviderNotFoundException(sprintf('No Authentication Provider found for token of class "%s".', get_class($token)));
+            $lastException = new ProviderNotFoundException(sprintf('No Authentication Provider found for token of class "%s".', \get_class($token)));
         }
 
         if (null !== $this->eventDispatcher) {
diff --git a/Authentication/Token/AbstractToken.php b/Authentication/Token/AbstractToken.php
@@ -38,10 +38,10 @@ abstract class AbstractToken implements TokenInterface
     public function __construct(array $roles = array())
     {
         foreach ($roles as $role) {
-            if (is_string($role)) {
+            if (\is_string($role)) {
                 $role = new Role($role);
             } elseif (!$role instanceof RoleInterface) {
-                throw new \InvalidArgumentException(sprintf('$roles must be an array of strings, Role instances or RoleInterface instances, but got %s.', gettype($role)));
+                throw new \InvalidArgumentException(sprintf('$roles must be an array of strings, Role instances or RoleInterface instances, but got %s.', \gettype($role)));
             }
 
             $this->roles[] = $role;
@@ -81,7 +81,7 @@ public function getUser()
      */
     public function setUser($user)
     {
-        if (!($user instanceof UserInterface || (is_object($user) && method_exists($user, '__toString')) || is_string($user))) {
+        if (!($user instanceof UserInterface || (\is_object($user) && method_exists($user, '__toString')) || \is_string($user))) {
             throw new \InvalidArgumentException('$user must be an instanceof UserInterface, an object implementing a __toString method, or a primitive string.');
         }
 
@@ -139,7 +139,7 @@ public function serialize()
     {
         return serialize(
             array(
-                is_object($this->user) ? clone $this->user : $this->user,
+                \is_object($this->user) ? clone $this->user : $this->user,
                 $this->authenticated,
                 array_map(function ($role) { return clone $role; }, $this->roles),
                 $this->attributes,
@@ -221,7 +221,7 @@ public function setAttribute($name, $value)
      */
     public function __toString()
     {
-        $class = get_class($this);
+        $class = \get_class($this);
         $class = substr($class, strrpos($class, '\\') + 1);
 
         $roles = array();
diff --git a/Authentication/Token/UsernamePasswordToken.php b/Authentication/Token/UsernamePasswordToken.php
@@ -43,7 +43,7 @@ public function __construct($user, $credentials, $providerKey, array $roles = ar
         $this->credentials = $credentials;
         $this->providerKey = $providerKey;
 
-        parent::setAuthenticated(count($roles) > 0);
+        parent::setAuthenticated(\count($roles) > 0);
     }
 
     /**
diff --git a/Authorization/AccessDecisionManager.php b/Authorization/AccessDecisionManager.php
@@ -43,7 +43,7 @@ class AccessDecisionManager implements AccessDecisionManagerInterface
     public function __construct($voters = array(), $strategy = self::STRATEGY_AFFIRMATIVE, $allowIfAllAbstainDecisions = false, $allowIfEqualGrantedDeniedDecisions = true)
     {
         $strategyMethod = 'decide'.ucfirst($strategy);
-        if (!is_callable(array($this, $strategyMethod))) {
+        if (!\is_callable(array($this, $strategyMethod))) {
             throw new \InvalidArgumentException(sprintf('The strategy "%s" is not supported.', $strategy));
         }
 
@@ -212,6 +212,6 @@ private function vote($voter, TokenInterface $token, $subject, $attributes)
             return $voter->vote($token, $subject, $attributes);
         }
 
-        throw new LogicException(sprintf('%s should implement the %s interface when used as voter.', get_class($voter), VoterInterface::class));
+        throw new LogicException(sprintf('%s should implement the %s interface when used as voter.', \get_class($voter), VoterInterface::class));
     }
 }
diff --git a/Authorization/AuthorizationChecker.php b/Authorization/AuthorizationChecker.php
@@ -59,7 +59,7 @@ final public function isGranted($attributes, $subject = null)
             $this->tokenStorage->setToken($token = $this->authenticationManager->authenticate($token));
         }
 
-        if (!is_array($attributes)) {
+        if (!\is_array($attributes)) {
             $attributes = array($attributes);
         }
 
diff --git a/Authorization/ExpressionLanguageProvider.php b/Authorization/ExpressionLanguageProvider.php
@@ -51,7 +51,7 @@ public function getFunctions()
             new ExpressionFunction('has_role', function ($role) {
                 return sprintf('in_array(%s, $roles)', $role);
             }, function (array $variables, $role) {
-                return in_array($role, $variables['roles']);
+                return \in_array($role, $variables['roles']);
             }),
         );
     }
diff --git a/Authorization/Voter/RoleVoter.php b/Authorization/Voter/RoleVoter.php
@@ -44,7 +44,7 @@ public function vote(TokenInterface $token, $subject, array $attributes)
                 $attribute = $attribute->getRole();
             }
 
-            if (!is_string($attribute) || 0 !== strpos($attribute, $this->prefix)) {
+            if (!\is_string($attribute) || 0 !== strpos($attribute, $this->prefix)) {
                 continue;
             }
 
diff --git a/Encoder/BasePasswordEncoder.php b/Encoder/BasePasswordEncoder.php
@@ -37,7 +37,7 @@ protected function demergePasswordAndSalt($mergedPasswordSalt)
         $salt = '';
         $saltBegins = strrpos($mergedPasswordSalt, '{');
 
-        if (false !== $saltBegins && $saltBegins + 1 < strlen($mergedPasswordSalt)) {
+        if (false !== $saltBegins && $saltBegins + 1 < \strlen($mergedPasswordSalt)) {
             $salt = substr($mergedPasswordSalt, $saltBegins + 1, -1);
             $password = substr($mergedPasswordSalt, 0, $saltBegins);
         }
@@ -93,6 +93,6 @@ protected function comparePasswords($password1, $password2)
      */
     protected function isPasswordTooLong($password)
     {
-        return strlen($password) > static::MAX_PASSWORD_LENGTH;
+        return \strlen($password) > static::MAX_PASSWORD_LENGTH;
     }
 }
diff --git a/Encoder/EncoderFactory.php b/Encoder/EncoderFactory.php
@@ -40,15 +40,15 @@ public function getEncoder($user)
             $encoderKey = $encoderName;
         } else {
             foreach ($this->encoders as $class => $encoder) {
-                if ((is_object($user) && $user instanceof $class) || (!is_object($user) && (is_subclass_of($user, $class) || $user == $class))) {
+                if ((\is_object($user) && $user instanceof $class) || (!\is_object($user) && (is_subclass_of($user, $class) || $user == $class))) {
                     $encoderKey = $class;
                     break;
                 }
             }
         }
 
         if (null === $encoderKey) {
-            throw new \RuntimeException(sprintf('No encoder has been configured for account "%s".', is_object($user) ? get_class($user) : $user));
+            throw new \RuntimeException(sprintf('No encoder has been configured for account "%s".', \is_object($user) ? \get_class($user) : $user));
         }
 
         if (!$this->encoders[$encoderKey] instanceof PasswordEncoderInterface) {
diff --git a/Encoder/MessageDigestPasswordEncoder.php b/Encoder/MessageDigestPasswordEncoder.php
@@ -45,7 +45,7 @@ public function encodePassword($raw, $salt)
             throw new BadCredentialsException('Invalid password.');
         }
 
-        if (!in_array($this->algorithm, hash_algos(), true)) {
+        if (!\in_array($this->algorithm, hash_algos(), true)) {
             throw new \LogicException(sprintf('The algorithm "%s" is not supported.', $this->algorithm));
         }
 
diff --git a/Encoder/Pbkdf2PasswordEncoder.php b/Encoder/Pbkdf2PasswordEncoder.php
@@ -58,7 +58,7 @@ public function encodePassword($raw, $salt)
             throw new BadCredentialsException('Invalid password.');
         }
 
-        if (!in_array($this->algorithm, hash_algos(), true)) {
+        if (!\in_array($this->algorithm, hash_algos(), true)) {
             throw new \LogicException(sprintf('The algorithm "%s" is not supported.', $this->algorithm));
         }
 
diff --git a/Security.php b/Security.php
@@ -42,7 +42,7 @@ public function getUser()
         }
 
         $user = $token->getUser();
-        if (!is_object($user)) {
+        if (!\is_object($user)) {
             return null;
         }
 
diff --git a/Tests/Authorization/Voter/VoterTest.php b/Tests/Authorization/Voter/VoterTest.php
@@ -66,6 +66,6 @@ protected function voteOnAttribute($attribute, $object, TokenInterface $token)
 
     protected function supports($attribute, $object)
     {
-        return $object instanceof \stdClass && in_array($attribute, array('EDIT', 'CREATE'));
+        return $object instanceof \stdClass && \in_array($attribute, array('EDIT', 'CREATE'));
     }
 }
diff --git a/Tests/Encoder/BCryptPasswordEncoderTest.php b/Tests/Encoder/BCryptPasswordEncoderTest.php
@@ -58,7 +58,7 @@ public function testResultLength()
     {
         $encoder = new BCryptPasswordEncoder(self::VALID_COST);
         $result = $encoder->encodePassword(self::PASSWORD, null);
-        $this->assertEquals(60, strlen($result));
+        $this->assertEquals(60, \strlen($result));
     }
 
     public function testValidation()
diff --git a/Tests/Resources/TranslationFilesTest.php b/Tests/Resources/TranslationFilesTest.php
@@ -33,15 +33,15 @@ public function provideTranslationFiles()
     {
         return array_map(
             function ($filePath) { return (array) $filePath; },
-            glob(dirname(dirname(__DIR__)).'/Resources/translations/*.xlf')
+            glob(\dirname(\dirname(__DIR__)).'/Resources/translations/*.xlf')
         );
     }
 
     public function testNorwegianAlias()
     {
         $this->assertFileEquals(
-            dirname(dirname(__DIR__)).'/Resources/translations/security.nb.xlf',
-            dirname(dirname(__DIR__)).'/Resources/translations/security.no.xlf',
+            \dirname(\dirname(__DIR__)).'/Resources/translations/security.nb.xlf',
+            \dirname(\dirname(__DIR__)).'/Resources/translations/security.no.xlf',
             'The NO locale should be an alias for the NB variant of the Norwegian language.'
         );
     }
diff --git a/User/ChainUserProvider.php b/User/ChainUserProvider.php
@@ -87,7 +87,7 @@ public function refreshUser(UserInterface $user)
             $e->setUsername($user->getUsername());
             throw $e;
         } else {
-            throw new UnsupportedUserException(sprintf('The account "%s" is not supported.', get_class($user)));
+            throw new UnsupportedUserException(sprintf('The account "%s" is not supported.', \get_class($user)));
         }
     }
 
diff --git a/User/InMemoryUserProvider.php b/User/InMemoryUserProvider.php
@@ -74,7 +74,7 @@ public function loadUserByUsername($username)
     public function refreshUser(UserInterface $user)
     {
         if (!$user instanceof User) {
-            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user)));
+            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));
         }
 
         $storedUser = $this->getUser($user->getUsername());
diff --git a/User/LdapUserProvider.php b/User/LdapUserProvider.php
@@ -76,7 +76,7 @@ public function loadUserByUsername($username)
         }
 
         $entries = $search->execute();
-        $count = count($entries);
+        $count = \count($entries);
 
         if (!$count) {
             throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
@@ -104,7 +104,7 @@ public function loadUserByUsername($username)
     public function refreshUser(UserInterface $user)
     {
         if (!$user instanceof User) {
-            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user)));
+            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));
         }
 
         return new User($user->getUsername(), null, $user->getRoles());
@@ -151,7 +151,7 @@ private function getAttributeValue(Entry $entry, $attribute)
 
         $values = $entry->getAttribute($attribute);
 
-        if (1 !== count($values)) {
+        if (1 !== \count($values)) {
             throw new InvalidArgumentException(sprintf('Attribute "%s" has multiple values.', $attribute));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function authenticate(TokenInterface $token)`
`65`	`65`
`66`	`66`	`foreach ($this->providers as $provider) {`
`67`	`67`	`if (!$provider instanceof AuthenticationProviderInterface) {`
`68`		`- throw new \InvalidArgumentException(sprintf('Provider "%s" must implement the AuthenticationProviderInterface.', get_class($provider)));`
	`68`	`+ throw new \InvalidArgumentException(sprintf('Provider "%s" must implement the AuthenticationProviderInterface.', \get_class($provider)));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if (!$provider->supports($token)) {`
`@@ -100,7 +100,7 @@ public function authenticate(TokenInterface $token)`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if (null === $lastException) {`
`103`		`- $lastException = new ProviderNotFoundException(sprintf('No Authentication Provider found for token of class "%s".', get_class($token)));`
	`103`	`+ $lastException = new ProviderNotFoundException(sprintf('No Authentication Provider found for token of class "%s".', \get_class($token)));`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`if (null !== $this->eventDispatcher) {`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@ abstract class AbstractToken implements TokenInterface`
`38`	`38`	`public function __construct(array $roles = array())`
`39`	`39`	`{`
`40`	`40`	`foreach ($roles as $role) {`
`41`		`- if (is_string($role)) {`
	`41`	`+ if (\is_string($role)) {`
`42`	`42`	`$role = new Role($role);`
`43`	`43`	`} elseif (!$role instanceof RoleInterface) {`
`44`		`- throw new \InvalidArgumentException(sprintf('$roles must be an array of strings, Role instances or RoleInterface instances, but got %s.', gettype($role)));`
	`44`	`+ throw new \InvalidArgumentException(sprintf('$roles must be an array of strings, Role instances or RoleInterface instances, but got %s.', \gettype($role)));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`$this->roles[] = $role;`
`@@ -81,7 +81,7 @@ public function getUser()`
`81`	`81`	`*/`
`82`	`82`	`public function setUser($user)`
`83`	`83`	`{`
`84`		`- if (!($user instanceof UserInterface \|\| (is_object($user) && method_exists($user, '__toString')) \|\| is_string($user))) {`
	`84`	`+ if (!($user instanceof UserInterface \|\| (\is_object($user) && method_exists($user, '__toString')) \|\| \is_string($user))) {`
`85`	`85`	`throw new \InvalidArgumentException('$user must be an instanceof UserInterface, an object implementing a __toString method, or a primitive string.');`
`86`	`86`	`}`
`87`	`87`
`@@ -139,7 +139,7 @@ public function serialize()`
`139`	`139`	`{`
`140`	`140`	`return serialize(`
`141`	`141`	`array(`
`142`		`- is_object($this->user) ? clone $this->user : $this->user,`
	`142`	`+ \is_object($this->user) ? clone $this->user : $this->user,`
`143`	`143`	`$this->authenticated,`
`144`	`144`	`array_map(function ($role) { return clone $role; }, $this->roles),`
`145`	`145`	`$this->attributes,`
`@@ -221,7 +221,7 @@ public function setAttribute($name, $value)`
`221`	`221`	`*/`
`222`	`222`	`public function __toString()`
`223`	`223`	`{`
`224`		`- $class = get_class($this);`
	`224`	`+ $class = \get_class($this);`
`225`	`225`	`$class = substr($class, strrpos($class, '\\') + 1);`
`226`	`226`
`227`	`227`	`$roles = array();`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct($user, $credentials, $providerKey, array $roles = ar`
`43`	`43`	`$this->credentials = $credentials;`
`44`	`44`	`$this->providerKey = $providerKey;`
`45`	`45`
`46`		`- parent::setAuthenticated(count($roles) > 0);`
	`46`	`+ parent::setAuthenticated(\count($roles) > 0);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class AccessDecisionManager implements AccessDecisionManagerInterface`
`43`	`43`	`public function __construct($voters = array(), $strategy = self::STRATEGY_AFFIRMATIVE, $allowIfAllAbstainDecisions = false, $allowIfEqualGrantedDeniedDecisions = true)`
`44`	`44`	`{`
`45`	`45`	`$strategyMethod = 'decide'.ucfirst($strategy);`
`46`		`- if (!is_callable(array($this, $strategyMethod))) {`
	`46`	`+ if (!\is_callable(array($this, $strategyMethod))) {`
`47`	`47`	`throw new \InvalidArgumentException(sprintf('The strategy "%s" is not supported.', $strategy));`
`48`	`48`	`}`
`49`	`49`
`@@ -212,6 +212,6 @@ private function vote($voter, TokenInterface $token, $subject, $attributes)`
`212`	`212`	`return $voter->vote($token, $subject, $attributes);`
`213`	`213`	`}`
`214`	`214`
`215`		`- throw new LogicException(sprintf('%s should implement the %s interface when used as voter.', get_class($voter), VoterInterface::class));`
	`215`	`+ throw new LogicException(sprintf('%s should implement the %s interface when used as voter.', \get_class($voter), VoterInterface::class));`
`216`	`216`	`}`
`217`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ final public function isGranted($attributes, $subject = null)`
`59`	`59`	`$this->tokenStorage->setToken($token = $this->authenticationManager->authenticate($token));`
`60`	`60`	`}`
`61`	`61`
`62`		`- if (!is_array($attributes)) {`
	`62`	`+ if (!\is_array($attributes)) {`
`63`	`63`	`$attributes = array($attributes);`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function getFunctions()`
`51`	`51`	`new ExpressionFunction('has_role', function ($role) {`
`52`	`52`	`return sprintf('in_array(%s, $roles)', $role);`
`53`	`53`	`}, function (array $variables, $role) {`
`54`		`- return in_array($role, $variables['roles']);`
	`54`	`+ return \in_array($role, $variables['roles']);`
`55`	`55`	`}),`
`56`	`56`	`);`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function vote(TokenInterface $token, $subject, array $attributes)`
`44`	`44`	`$attribute = $attribute->getRole();`
`45`	`45`	`}`
`46`	`46`
`47`		`- if (!is_string($attribute) \|\| 0 !== strpos($attribute, $this->prefix)) {`
	`47`	`+ if (!\is_string($attribute) \|\| 0 !== strpos($attribute, $this->prefix)) {`
`48`	`48`	`continue;`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected function demergePasswordAndSalt($mergedPasswordSalt)`
`37`	`37`	`$salt = '';`
`38`	`38`	`$saltBegins = strrpos($mergedPasswordSalt, '{');`
`39`	`39`
`40`		`- if (false !== $saltBegins && $saltBegins + 1 < strlen($mergedPasswordSalt)) {`
	`40`	`+ if (false !== $saltBegins && $saltBegins + 1 < \strlen($mergedPasswordSalt)) {`
`41`	`41`	`$salt = substr($mergedPasswordSalt, $saltBegins + 1, -1);`
`42`	`42`	`$password = substr($mergedPasswordSalt, 0, $saltBegins);`
`43`	`43`	`}`
`@@ -93,6 +93,6 @@ protected function comparePasswords($password1, $password2)`
`93`	`93`	`*/`
`94`	`94`	`protected function isPasswordTooLong($password)`
`95`	`95`	`{`
`96`		`- return strlen($password) > static::MAX_PASSWORD_LENGTH;`
	`96`	`+ return \strlen($password) > static::MAX_PASSWORD_LENGTH;`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,15 @@ public function getEncoder($user)`
`40`	`40`	`$encoderKey = $encoderName;`
`41`	`41`	`} else {`
`42`	`42`	`foreach ($this->encoders as $class => $encoder) {`
`43`		`- if ((is_object($user) && $user instanceof $class) \|\| (!is_object($user) && (is_subclass_of($user, $class) \|\| $user == $class))) {`
	`43`	`+ if ((\is_object($user) && $user instanceof $class) \|\| (!\is_object($user) && (is_subclass_of($user, $class) \|\| $user == $class))) {`
`44`	`44`	`$encoderKey = $class;`
`45`	`45`	`break;`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`if (null === $encoderKey) {`
`51`		`- throw new \RuntimeException(sprintf('No encoder has been configured for account "%s".', is_object($user) ? get_class($user) : $user));`
	`51`	`+ throw new \RuntimeException(sprintf('No encoder has been configured for account "%s".', \is_object($user) ? \get_class($user) : $user));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if (!$this->encoders[$encoderKey] instanceof PasswordEncoderInterface) {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function encodePassword($raw, $salt)`
`45`	`45`	`throw new BadCredentialsException('Invalid password.');`
`46`	`46`	`}`
`47`	`47`
`48`		`- if (!in_array($this->algorithm, hash_algos(), true)) {`
	`48`	`+ if (!\in_array($this->algorithm, hash_algos(), true)) {`
`49`	`49`	`throw new \LogicException(sprintf('The algorithm "%s" is not supported.', $this->algorithm));`
`50`	`50`	`}`
`51`	`51`