Skip to content

Commit

Permalink
feature #27 Remove League sub-namespace (mtarld)
Browse files Browse the repository at this point in the history 
This PR was merged into the 0.1-dev branch.

Discussion
----------

Remove League sub-namespace

Closes #21

Commits
-------

09d69f1 Remove League sub-namespace
  • Loading branch information
@chalasr
chalasr committed May 6, 2021
2 parents f48eacc + 09d69f1 commit 705f7a9
Show file tree
Hide file tree
Showing 24 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion docs/implementing-custom-grant-type.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion ...AuthorizationServer/GrantConfigurator.php → ...AuthorizationServer/GrantConfigurator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace League\Bundle\OAuth2ServerBundle\League\AuthorizationServer;
namespace League\Bundle\OAuth2ServerBundle\AuthorizationServer;

use League\OAuth2\Server\AuthorizationServer;

Expand Down
2 changes: 1 addition & 1 deletion ...uthorizationServer/GrantTypeInterface.php → ...uthorizationServer/GrantTypeInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Converter/ScopeConverter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Converter/ScopeConverterInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Converter/UserConverter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/LeagueOAuth2ServerExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/League/Entity/AccessToken.php → src/Entity/AccessToken.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/League/Entity/AuthCode.php → src/Entity/AuthCode.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/League/Entity/Client.php → src/Entity/Client.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/League/Entity/RefreshToken.php → src/Entity/RefreshToken.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/League/Entity/Scope.php → src/Entity/Scope.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/League/Entity/User.php → src/Entity/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ague/Repository/AccessTokenRepository.php → src/Repository/AccessTokenRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/League/Repository/AuthCodeRepository.php → src/Repository/AuthCodeRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/League/Repository/ClientRepository.php → src/Repository/ClientRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...gue/Repository/RefreshTokenRepository.php → src/Repository/RefreshTokenRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/League/Repository/ScopeRepository.php → src/Repository/ScopeRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/League/Repository/UserRepository.php → src/Repository/UserRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions src/Resources/config/services.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/FakeGrant.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions tests/Integration/AbstractIntegrationTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Integration/AuthCodeRepositoryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions tests/TestHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 705f7a9

Please sign in to comment.