minor #4 Fixed CS (chalasr)

This PR was merged into the 0.1-dev branch.

Discussion
----------

Fixed CS

No global imports.

Commits
-------

e4f7756 Fixed CS

Author: chalasr

.php_cs.dist

@@ -22,6 +22,11 @@ return PhpCsFixer\Config::create()
         'concat_space' => ['spacing' => 'one'],
         'declare_strict_types' => true,
         'heredoc_to_nowdoc' => true,
+        'global_namespace_import' => [
+            'import_classes' => false,
+            'import_constants' => false,
+            'import_functions' => false,
+        ],
         'list_syntax' => ['syntax' => 'short'],
         'no_null_property_initialization' => true,
         'no_superfluous_phpdoc_tags' => true,

.travis.yml

@@ -22,5 +22,5 @@ before_script:
 
 script:
     - stty cols 120
-    - if [ "$CHECK_CS" == 1 ]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.15.8/php-cs-fixer.phar && php php-cs-fixer.phar fix --dry-run --diff; fi
+    - if [ "$CHECK_CS" == 1 ]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.7/php-cs-fixer.phar && php php-cs-fixer.phar fix --dry-run --diff; fi
     - vendor/bin/simple-phpunit

src/Command/CreateClientCommand.php

@@ -4,7 +4,6 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Command;
 
-use InvalidArgumentException;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
 use League\Bundle\OAuth2ServerBundle\Model\Grant;
@@ -86,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         try {
             $client = $this->buildClientFromInput($input);
-        } catch (InvalidArgumentException $exception) {
+        } catch (\InvalidArgumentException $exception) {
             $io->error($exception->getMessage());
 
             return 1;
@@ -111,7 +110,7 @@ private function buildClientFromInput(InputInterface $input): Client
         $isPublic = $input->getOption('public');
 
         if (null !== $input->getArgument('secret') && $isPublic) {
-            throw new InvalidArgumentException('The client cannot have a secret and be public.');
+            throw new \InvalidArgumentException('The client cannot have a secret and be public.');
         }
 
         $secret = $isPublic ? null : $input->getArgument('secret') ?? hash('sha512', random_bytes(32));

src/DBAL/Type/ImplodedArray.php

@@ -6,8 +6,6 @@
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\TextType;
-use InvalidArgumentException;
-use LogicException;
 
 abstract class ImplodedArray extends TextType
 {
@@ -22,7 +20,7 @@ abstract class ImplodedArray extends TextType
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
         if (!\is_array($value)) {
-            throw new LogicException('This type can only be used in combination with arrays.');
+            throw new \LogicException('This type can only be used in combination with arrays.');
         }
 
         if (0 === \count($value)) {
@@ -82,7 +80,7 @@ private function assertValueCanBeImploded($value): void
             return;
         }
 
-        throw new InvalidArgumentException(sprintf('The value of \'%s\' type cannot be imploded.', \gettype($value)));
+        throw new \InvalidArgumentException(sprintf('The value of \'%s\' type cannot be imploded.', \gettype($value)));
     }
 
     abstract protected function convertDatabaseValues(array $values): array;

src/DependencyInjection/LeagueOAuth2ServerExtension.php

@@ -4,10 +4,8 @@
 
 namespace League\Bundle\OAuth2ServerBundle\DependencyInjection;
 
-use DateInterval;
 use Defuse\Crypto\Key;
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
-use Exception;
 use League\Bundle\OAuth2ServerBundle\DBAL\Type\Grant as GrantType;
 use League\Bundle\OAuth2ServerBundle\DBAL\Type\RedirectUri as RedirectUriType;
 use League\Bundle\OAuth2ServerBundle\DBAL\Type\Scope as ScopeType;
@@ -29,8 +27,6 @@
 use League\OAuth2\Server\Grant\PasswordGrant;
 use League\OAuth2\Server\Grant\RefreshTokenGrant;
 use League\OAuth2\Server\ResourceServer;
-use LogicException;
-use RuntimeException;
 use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Component\Config\FileLocator;
@@ -49,7 +45,7 @@ final class LeagueOAuth2ServerExtension extends Extension implements PrependExte
     /**
      * {@inheritdoc}
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -120,7 +116,7 @@ private function assertRequiredBundlesAreEnabled(ContainerBuilder $container): v
 
         foreach ($requiredBundles as $bundleAlias => $requiredBundle) {
             if (!$container->hasExtension($bundleAlias)) {
-                throw new LogicException(sprintf('Bundle \'%s\' needs to be enabled in your application kernel.', $requiredBundle));
+                throw new \LogicException(sprintf('Bundle \'%s\' needs to be enabled in your application kernel.', $requiredBundle));
             }
         }
     }
@@ -139,7 +135,7 @@ private function configureAuthorizationServer(ContainerBuilder $container, array
             $authorizationServer->replaceArgument('$encryptionKey', $config['encryption_key']);
         } elseif ('defuse' === $config['encryption_key_type']) {
             if (!class_exists(Key::class)) {
-                throw new RuntimeException('You must install the "defuse/php-encryption" package to use "encryption_key_type: defuse".');
+                throw new \RuntimeException('You must install the "defuse/php-encryption" package to use "encryption_key_type: defuse".');
             }
 
             $keyDefinition = (new Definition(Key::class))
@@ -153,35 +149,35 @@ private function configureAuthorizationServer(ContainerBuilder $container, array
         if ($config['enable_client_credentials_grant']) {
             $authorizationServer->addMethodCall('enableGrantType', [
                 new Reference(ClientCredentialsGrant::class),
-                new Definition(DateInterval::class, [$config['access_token_ttl']]),
+                new Definition(\DateInterval::class, [$config['access_token_ttl']]),
             ]);
         }
 
         if ($config['enable_password_grant']) {
             $authorizationServer->addMethodCall('enableGrantType', [
                 new Reference(PasswordGrant::class),
-                new Definition(DateInterval::class, [$config['access_token_ttl']]),
+                new Definition(\DateInterval::class, [$config['access_token_ttl']]),
             ]);
         }
 
         if ($config['enable_refresh_token_grant']) {
             $authorizationServer->addMethodCall('enableGrantType', [
                 new Reference(RefreshTokenGrant::class),
-                new Definition(DateInterval::class, [$config['access_token_ttl']]),
+                new Definition(\DateInterval::class, [$config['access_token_ttl']]),
             ]);
         }
 
         if ($config['enable_auth_code_grant']) {
             $authorizationServer->addMethodCall('enableGrantType', [
                 new Reference(AuthCodeGrant::class),
-                new Definition(DateInterval::class, [$config['access_token_ttl']]),
+                new Definition(\DateInterval::class, [$config['access_token_ttl']]),
             ]);
         }
 
         if ($config['enable_implicit_grant']) {
             $authorizationServer->addMethodCall('enableGrantType', [
                 new Reference(ImplicitGrant::class),
-                new Definition(DateInterval::class, [$config['access_token_ttl']]),
+                new Definition(\DateInterval::class, [$config['access_token_ttl']]),
             ]);
         }
 
@@ -193,21 +189,21 @@ private function configureGrants(ContainerBuilder $container, array $config): vo
         $container
             ->getDefinition(PasswordGrant::class)
             ->addMethodCall('setRefreshTokenTTL', [
-                new Definition(DateInterval::class, [$config['refresh_token_ttl']]),
+                new Definition(\DateInterval::class, [$config['refresh_token_ttl']]),
             ])
         ;
 
         $container
             ->getDefinition(RefreshTokenGrant::class)
             ->addMethodCall('setRefreshTokenTTL', [
-                new Definition(DateInterval::class, [$config['refresh_token_ttl']]),
+                new Definition(\DateInterval::class, [$config['refresh_token_ttl']]),
             ])
         ;
 
         $authCodeGrantDefinition = $container->getDefinition(AuthCodeGrant::class);
-        $authCodeGrantDefinition->replaceArgument('$authCodeTTL', new Definition(DateInterval::class, [$config['auth_code_ttl']]))
+        $authCodeGrantDefinition->replaceArgument('$authCodeTTL', new Definition(\DateInterval::class, [$config['auth_code_ttl']]))
             ->addMethodCall('setRefreshTokenTTL', [
-                new Definition(DateInterval::class, [$config['refresh_token_ttl']]),
+                new Definition(\DateInterval::class, [$config['refresh_token_ttl']]),
             ])
         ;
 
@@ -217,17 +213,17 @@ private function configureGrants(ContainerBuilder $container, array $config): vo
 
         $container
             ->getDefinition(ImplicitGrant::class)
-            ->replaceArgument('$accessTokenTTL', new Definition(DateInterval::class, [$config['access_token_ttl']]))
+            ->replaceArgument('$accessTokenTTL', new Definition(\DateInterval::class, [$config['access_token_ttl']]))
         ;
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     private function configurePersistence(LoaderInterface $loader, ContainerBuilder $container, array $config): void
     {
         if (\count($config) > 1) {
-            throw new LogicException('Only one persistence method can be configured at a time.');
+            throw new \LogicException('Only one persistence method can be configured at a time.');
         }
 
         $persistenceConfiguration = current($config);

src/Event/AuthorizationRequestResolveEventFactory.php

@@ -7,7 +7,6 @@
 use League\Bundle\OAuth2ServerBundle\Converter\ScopeConverterInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\OAuth2\Server\RequestTypes\AuthorizationRequest;
-use RuntimeException;
 
 class AuthorizationRequestResolveEventFactory
 {
@@ -27,7 +26,7 @@ public function fromAuthorizationRequest(AuthorizationRequest $authorizationRequ
         $client = $this->clientManager->find($authorizationRequest->getClient()->getIdentifier());
 
         if (null === $client) {
-            throw new RuntimeException(sprintf('No client found for the given identifier \'%s\'.', $authorizationRequest->getClient()->getIdentifier()));
+            throw new \RuntimeException(sprintf('No client found for the given identifier \'%s\'.', $authorizationRequest->getClient()->getIdentifier()));
         }
 
         return new AuthorizationRequestResolveEvent($authorizationRequest, $scopes, $client);

src/League/AuthorizationServer/GrantTypeInterface.php

@@ -4,10 +4,9 @@
 
 namespace League\Bundle\OAuth2ServerBundle\League\AuthorizationServer;
 
-use DateInterval;
 use League\OAuth2\Server\Grant\GrantTypeInterface as LeagueGrantTypeInterface;
 
 interface GrantTypeInterface extends LeagueGrantTypeInterface
 {
-    public function getAccessTokenTTL(): ?DateInterval;
+    public function getAccessTokenTTL(): ?\DateInterval;
 }

src/Manager/Doctrine/AccessTokenManager.php

@@ -4,7 +4,6 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Manager\Doctrine;
 
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\AccessTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AccessToken;
@@ -43,7 +42,7 @@ public function clearExpired(): int
         return $this->entityManager->createQueryBuilder()
             ->delete(AccessToken::class, 'at')
             ->where('at.expiry < :expiry')
-            ->setParameter('expiry', new DateTimeImmutable())
+            ->setParameter('expiry', new \DateTimeImmutable())
             ->getQuery()
             ->execute();
     }

src/Manager/Doctrine/AuthorizationCodeManager.php

@@ -4,7 +4,6 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Manager\Doctrine;
 
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\AuthorizationCodeManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AuthorizationCode;
@@ -43,7 +42,7 @@ public function clearExpired(): int
         return $this->entityManager->createQueryBuilder()
             ->delete(AuthorizationCode::class, 'ac')
             ->where('ac.expiry < :expiry')
-            ->setParameter('expiry', new DateTimeImmutable())
+            ->setParameter('expiry', new \DateTimeImmutable())
             ->getQuery()
             ->execute();
     }

src/Manager/Doctrine/RefreshTokenManager.php

@@ -4,7 +4,6 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Manager\Doctrine;
 
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\RefreshTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken;
@@ -43,7 +42,7 @@ public function clearExpired(): int
         return $this->entityManager->createQueryBuilder()
             ->delete(RefreshToken::class, 'rt')
             ->where('rt.expiry < :expiry')
-            ->setParameter('expiry', new DateTimeImmutable())
+            ->setParameter('expiry', new \DateTimeImmutable())
             ->getQuery()
             ->execute();
     }