feature #27 Remove League sub-namespace (mtarld)

chalasr · chalasr · commit 705f7a9c4952 · 2021-05-06T10:30:00.000+02:00
This PR was merged into the 0.1-dev branch. Discussion ---------- Remove League sub-namespace Closes #21 Commits ------- 09d69f1 Remove League sub-namespace
diff --git a/docs/implementing-custom-grant-type.md b/docs/implementing-custom-grant-type.md
@@ -16,7 +16,7 @@
     use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
     use Nyholm\Psr7\Response;
     use Psr\Http\Message\ServerRequestInterface;
-    use League\Bundle\OAuth2ServerBundle\League\AuthorizationServer\GrantTypeInterface;
+    use League\Bundle\OAuth2ServerBundle\AuthorizationServer\GrantTypeInterface;
 
     final class FakeGrant extends AbstractGrant implements GrantTypeInterface
     {
diff --git a/src/AuthorizationServer/GrantConfigurator.php b/src/AuthorizationServer/GrantConfigurator.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\AuthorizationServer;
+namespace League\Bundle\OAuth2ServerBundle\AuthorizationServer;
 
 use League\OAuth2\Server\AuthorizationServer;
 
diff --git a/src/AuthorizationServer/GrantTypeInterface.php b/src/AuthorizationServer/GrantTypeInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\AuthorizationServer;
+namespace League\Bundle\OAuth2ServerBundle\AuthorizationServer;
 
 use League\OAuth2\Server\Grant\GrantTypeInterface as LeagueGrantTypeInterface;
 
diff --git a/src/Converter/ScopeConverter.php b/src/Converter/ScopeConverter.php
@@ -4,7 +4,7 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Converter;
 
-use League\Bundle\OAuth2ServerBundle\League\Entity\Scope as ScopeEntity;
+use League\Bundle\OAuth2ServerBundle\Entity\Scope as ScopeEntity;
 use League\Bundle\OAuth2ServerBundle\Model\Scope as ScopeModel;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
 
diff --git a/src/Converter/ScopeConverterInterface.php b/src/Converter/ScopeConverterInterface.php
@@ -4,7 +4,7 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Converter;
 
-use League\Bundle\OAuth2ServerBundle\League\Entity\Scope as ScopeEntity;
+use League\Bundle\OAuth2ServerBundle\Entity\Scope as ScopeEntity;
 use League\Bundle\OAuth2ServerBundle\Model\Scope as ScopeModel;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
 
diff --git a/src/Converter/UserConverter.php b/src/Converter/UserConverter.php
@@ -4,7 +4,7 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Converter;
 
-use League\Bundle\OAuth2ServerBundle\League\Entity\User;
+use League\Bundle\OAuth2ServerBundle\Entity\User;
 use League\OAuth2\Server\Entities\UserEntityInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
diff --git a/src/DependencyInjection/LeagueOAuth2ServerExtension.php b/src/DependencyInjection/LeagueOAuth2ServerExtension.php
@@ -6,10 +6,10 @@
 
 use Defuse\Crypto\Key;
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
+use League\Bundle\OAuth2ServerBundle\AuthorizationServer\GrantTypeInterface;
 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;
-use League\Bundle\OAuth2ServerBundle\League\AuthorizationServer\GrantTypeInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\Doctrine\AccessTokenManager;
 use League\Bundle\OAuth2ServerBundle\Manager\Doctrine\AuthorizationCodeManager;
 use League\Bundle\OAuth2ServerBundle\Manager\Doctrine\ClientManager;
diff --git a/src/Entity/AccessToken.php b/src/Entity/AccessToken.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Entity;
+namespace League\Bundle\OAuth2ServerBundle\Entity;
 
 use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
 use League\OAuth2\Server\Entities\Traits\AccessTokenTrait;
diff --git a/src/Entity/AuthCode.php b/src/Entity/AuthCode.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Entity;
+namespace League\Bundle\OAuth2ServerBundle\Entity;
 
 use League\OAuth2\Server\Entities\AuthCodeEntityInterface;
 use League\OAuth2\Server\Entities\Traits\AuthCodeTrait;
diff --git a/src/Entity/Client.php b/src/Entity/Client.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Entity;
+namespace League\Bundle\OAuth2ServerBundle\Entity;
 
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Entities\Traits\ClientTrait;
diff --git a/src/Entity/RefreshToken.php b/src/Entity/RefreshToken.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Entity;
+namespace League\Bundle\OAuth2ServerBundle\Entity;
 
 use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
 use League\OAuth2\Server\Entities\Traits\EntityTrait;
diff --git a/src/Entity/Scope.php b/src/Entity/Scope.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Entity;
+namespace League\Bundle\OAuth2ServerBundle\Entity;
 
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
 use League\OAuth2\Server\Entities\Traits\EntityTrait;
diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Entity;
+namespace League\Bundle\OAuth2ServerBundle\Entity;
 
 use League\OAuth2\Server\Entities\Traits\EntityTrait;
 use League\OAuth2\Server\Entities\UserEntityInterface;
diff --git a/src/Repository/AccessTokenRepository.php b/src/Repository/AccessTokenRepository.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Repository;
+namespace League\Bundle\OAuth2ServerBundle\Repository;
 
 use League\Bundle\OAuth2ServerBundle\Converter\ScopeConverterInterface;
-use League\Bundle\OAuth2ServerBundle\League\Entity\AccessToken as AccessTokenEntity;
+use League\Bundle\OAuth2ServerBundle\Entity\AccessToken as AccessTokenEntity;
 use League\Bundle\OAuth2ServerBundle\Manager\AccessTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AccessToken as AccessTokenModel;
diff --git a/src/Repository/AuthCodeRepository.php b/src/Repository/AuthCodeRepository.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Repository;
+namespace League\Bundle\OAuth2ServerBundle\Repository;
 
 use League\Bundle\OAuth2ServerBundle\Converter\ScopeConverterInterface;
-use League\Bundle\OAuth2ServerBundle\League\Entity\AuthCode;
+use League\Bundle\OAuth2ServerBundle\Entity\AuthCode;
 use League\Bundle\OAuth2ServerBundle\Manager\AuthorizationCodeManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AuthorizationCode;
diff --git a/src/Repository/ClientRepository.php b/src/Repository/ClientRepository.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Repository;
+namespace League\Bundle\OAuth2ServerBundle\Repository;
 
-use League\Bundle\OAuth2ServerBundle\League\Entity\Client as ClientEntity;
+use League\Bundle\OAuth2ServerBundle\Entity\Client as ClientEntity;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\Client as ClientModel;
 use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
diff --git a/src/Repository/RefreshTokenRepository.php b/src/Repository/RefreshTokenRepository.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Repository;
+namespace League\Bundle\OAuth2ServerBundle\Repository;
 
-use League\Bundle\OAuth2ServerBundle\League\Entity\RefreshToken as RefreshTokenEntity;
+use League\Bundle\OAuth2ServerBundle\Entity\RefreshToken as RefreshTokenEntity;
 use League\Bundle\OAuth2ServerBundle\Manager\AccessTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\RefreshTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken as RefreshTokenModel;
diff --git a/src/Repository/ScopeRepository.php b/src/Repository/ScopeRepository.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Repository;
+namespace League\Bundle\OAuth2ServerBundle\Repository;
 
 use League\Bundle\OAuth2ServerBundle\Converter\ScopeConverterInterface;
 use League\Bundle\OAuth2ServerBundle\Event\ScopeResolveEvent;
diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\League\Repository;
+namespace League\Bundle\OAuth2ServerBundle\Repository;
 
 use League\Bundle\OAuth2ServerBundle\Converter\UserConverterInterface;
 use League\Bundle\OAuth2ServerBundle\Event\UserResolveEvent;
diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php
@@ -4,6 +4,7 @@
 
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
+use League\Bundle\OAuth2ServerBundle\AuthorizationServer\GrantConfigurator;
 use League\Bundle\OAuth2ServerBundle\Command\ClearExpiredTokensCommand;
 use League\Bundle\OAuth2ServerBundle\Command\CreateClientCommand;
 use League\Bundle\OAuth2ServerBundle\Command\DeleteClientCommand;
@@ -17,20 +18,19 @@
 use League\Bundle\OAuth2ServerBundle\Converter\UserConverterInterface;
 use League\Bundle\OAuth2ServerBundle\Event\AuthorizationRequestResolveEventFactory;
 use League\Bundle\OAuth2ServerBundle\EventListener\AuthorizationRequestUserResolvingListener;
-use League\Bundle\OAuth2ServerBundle\League\AuthorizationServer\GrantConfigurator;
-use League\Bundle\OAuth2ServerBundle\League\Repository\AccessTokenRepository;
-use League\Bundle\OAuth2ServerBundle\League\Repository\AuthCodeRepository;
-use League\Bundle\OAuth2ServerBundle\League\Repository\ClientRepository;
-use League\Bundle\OAuth2ServerBundle\League\Repository\RefreshTokenRepository;
-use League\Bundle\OAuth2ServerBundle\League\Repository\ScopeRepository;
-use League\Bundle\OAuth2ServerBundle\League\Repository\UserRepository;
 use League\Bundle\OAuth2ServerBundle\Manager\AccessTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\AuthorizationCodeManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\InMemory\ScopeManager;
 use League\Bundle\OAuth2ServerBundle\Manager\RefreshTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ScopeManagerInterface;
 use League\Bundle\OAuth2ServerBundle\OAuth2Events;
+use League\Bundle\OAuth2ServerBundle\Repository\AccessTokenRepository;
+use League\Bundle\OAuth2ServerBundle\Repository\AuthCodeRepository;
+use League\Bundle\OAuth2ServerBundle\Repository\ClientRepository;
+use League\Bundle\OAuth2ServerBundle\Repository\RefreshTokenRepository;
+use League\Bundle\OAuth2ServerBundle\Repository\ScopeRepository;
+use League\Bundle\OAuth2ServerBundle\Repository\UserRepository;
 use League\Bundle\OAuth2ServerBundle\Security\Authenticator\OAuth2Authenticator;
 use League\Bundle\OAuth2ServerBundle\Security\EventListener\CheckScopeListener;
 use League\OAuth2\Server\AuthorizationServer;
diff --git a/tests/Fixtures/FakeGrant.php b/tests/Fixtures/FakeGrant.php
@@ -4,7 +4,7 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Tests\Fixtures;
 
-use League\Bundle\OAuth2ServerBundle\League\AuthorizationServer\GrantTypeInterface;
+use League\Bundle\OAuth2ServerBundle\AuthorizationServer\GrantTypeInterface;
 use League\OAuth2\Server\Grant\AbstractGrant;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
 use Nyholm\Psr7\Response;
diff --git a/tests/Integration/AbstractIntegrationTest.php b/tests/Integration/AbstractIntegrationTest.php
@@ -8,13 +8,7 @@
 use Defuse\Crypto\Exception\CryptoException;
 use League\Bundle\OAuth2ServerBundle\Converter\ScopeConverter;
 use League\Bundle\OAuth2ServerBundle\Converter\UserConverter;
-use League\Bundle\OAuth2ServerBundle\League\Entity\User;
-use League\Bundle\OAuth2ServerBundle\League\Repository\AccessTokenRepository;
-use League\Bundle\OAuth2ServerBundle\League\Repository\AuthCodeRepository;
-use League\Bundle\OAuth2ServerBundle\League\Repository\ClientRepository;
-use League\Bundle\OAuth2ServerBundle\League\Repository\RefreshTokenRepository;
-use League\Bundle\OAuth2ServerBundle\League\Repository\ScopeRepository;
-use League\Bundle\OAuth2ServerBundle\League\Repository\UserRepository;
+use League\Bundle\OAuth2ServerBundle\Entity\User;
 use League\Bundle\OAuth2ServerBundle\Manager\AccessTokenManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\AuthorizationCodeManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
@@ -27,6 +21,12 @@
 use League\Bundle\OAuth2ServerBundle\Manager\ScopeManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AccessToken;
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken;
+use League\Bundle\OAuth2ServerBundle\Repository\AccessTokenRepository;
+use League\Bundle\OAuth2ServerBundle\Repository\AuthCodeRepository;
+use League\Bundle\OAuth2ServerBundle\Repository\ClientRepository;
+use League\Bundle\OAuth2ServerBundle\Repository\RefreshTokenRepository;
+use League\Bundle\OAuth2ServerBundle\Repository\ScopeRepository;
+use League\Bundle\OAuth2ServerBundle\Repository\UserRepository;
 use League\Bundle\OAuth2ServerBundle\Tests\TestHelper;
 use League\OAuth2\Server\AuthorizationServer;
 use League\OAuth2\Server\CryptKey;
diff --git a/tests/Integration/AuthCodeRepositoryTest.php b/tests/Integration/AuthCodeRepositoryTest.php
@@ -5,9 +5,9 @@
 namespace League\Bundle\OAuth2ServerBundle\Tests\Integration;
 
 use League\Bundle\OAuth2ServerBundle\Converter\ScopeConverter;
-use League\Bundle\OAuth2ServerBundle\League\Repository\AuthCodeRepository;
 use League\Bundle\OAuth2ServerBundle\Model\AuthorizationCode;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
+use League\Bundle\OAuth2ServerBundle\Repository\AuthCodeRepository;
 
 final class AuthCodeRepositoryTest extends AbstractIntegrationTest
 {
diff --git a/tests/TestHelper.php b/tests/TestHelper.php
@@ -7,9 +7,9 @@
 use Defuse\Crypto\Crypto;
 use Defuse\Crypto\Exception\CryptoException;
 use League\Bundle\OAuth2ServerBundle\Converter\ScopeConverter;
-use League\Bundle\OAuth2ServerBundle\League\Entity\AccessToken as AccessTokenEntity;
-use League\Bundle\OAuth2ServerBundle\League\Entity\Client as ClientEntity;
-use League\Bundle\OAuth2ServerBundle\League\Entity\Scope as ScopeEntity;
+use League\Bundle\OAuth2ServerBundle\Entity\AccessToken as AccessTokenEntity;
+use League\Bundle\OAuth2ServerBundle\Entity\Client as ClientEntity;
+use League\Bundle\OAuth2ServerBundle\Entity\Scope as ScopeEntity;
 use League\Bundle\OAuth2ServerBundle\Model\AccessToken as AccessTokenModel;
 use League\Bundle\OAuth2ServerBundle\Model\AuthorizationCode as AuthorizationCodeModel;
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken as RefreshTokenModel;

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;`
`17`	`17`	`use Nyholm\Psr7\Response;`
`18`	`18`	`use Psr\Http\Message\ServerRequestInterface;`
`19`		`- use League\Bundle\OAuth2ServerBundle\League\AuthorizationServer\GrantTypeInterface;`
	`19`	`+ use League\Bundle\OAuth2ServerBundle\AuthorizationServer\GrantTypeInterface;`
`20`	`20`
`21`	`21`	`final class FakeGrant extends AbstractGrant implements GrantTypeInterface`
`22`	`22`	`{`