diff --git a/.gitattributes b/.gitattributes index cb4ac9a..d0736d2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,11 +1,8 @@ -/tests export-ignore -/dev export-ignore -/.github export-ignore /.editorconfig export-ignore /.gitattributes export-ignore +/.github export-ignore /.gitignore export-ignore -/.php-cs-fixer.dist export-ignore -/docker-compose.yml export-ignore +/.php-cs-fixer.dist.php export-ignore /phpunit.xml.dist export-ignore -/.psalm.baseline.xml export-ignore -/psalm.xml export-ignore +/phpstan.dist.neon export-ignore +/tests export-ignore diff --git a/compose.yaml b/compose.yaml deleted file mode 100644 index 2b98d39..0000000 --- a/compose.yaml +++ /dev/null @@ -1,11 +0,0 @@ -services: - php: - build: ./dev/docker - environment: - HOST_USER_ID: ${HOST_USER_ID} - HOST_GROUP_ID: ${HOST_GROUP_ID} - HOST_IP: ${HOST_IP:-} - SYMFONY_REQUIRE: ${SYMFONY_REQUIRE:-6.4.*} - image: league/oauth2-server-bundle - volumes: - - .:/app/src diff --git a/tests/Unit/OAuth2AuthenticatorTest.php b/tests/Unit/OAuth2AuthenticatorTest.php index f8f94b9..f8ac1ad 100644 --- a/tests/Unit/OAuth2AuthenticatorTest.php +++ b/tests/Unit/OAuth2AuthenticatorTest.php @@ -19,7 +19,6 @@ use Symfony\Component\Security\Core\User\UserProviderInterface; use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; use Symfony\Component\Security\Http\Authenticator\Passport\Passport; -use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface; use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport; final class OAuth2AuthenticatorTest extends TestCase @@ -132,41 +131,6 @@ public function testAuthenticateCreatePassportWithClientCredentialsUser(): void $this->assertInstanceOf(ClientCredentialsUser::class, $passport->getUser()); } - /** - * @group legacy - */ - public function testCreateAuthenticatedToken(): void - { - if (!interface_exists(PassportInterface::class)) { - $this->markTestSkipped('Irrelevant on Symfony 6+'); - } - - $userBadge = new UserBadge('oauthClientId', static function (): UserInterface { - return new ClientCredentialsUser('oauthClientId'); - }); - - $passport = new SelfValidatingPassport($userBadge, [ - new ScopeBadge(['scope_one', 'scope_two']), - ]); - $passport->setAttribute('accessTokenId', 'accessTokenId'); - $passport->setAttribute('oauthClientId', 'oauthClientId'); - - $authenticator = new OAuth2Authenticator( - $this->createMock(HttpMessageFactoryInterface::class), - $this->createMock(ResourceServer::class), - $this->createMock(TestUserProvider::class), - 'PREFIX_' - ); - - $token = $authenticator->createAuthenticatedToken($passport, 'firewallName'); - - $this->assertSame(['scope_one', 'scope_two'], $token->getScopes()); - $this->assertSame('accessTokenId', $token->getCredentials()); - $this->assertInstanceOf(ClientCredentialsUser::class, $token->getUser()); - $this->assertSame('oauthClientId', $token->getUser()->getUserIdentifier()); - $this->assertTrue($token->isAuthenticated()); - } - public function testCreateToken(): void { $userBadge = new UserBadge('userIdentifier', static function (): UserInterface {