From 1f88ce8cb07d502038d6d5a5c52494db8c2e16a7 Mon Sep 17 00:00:00 2001 From: abdel Date: Sun, 6 Mar 2022 18:28:33 +0100 Subject: [PATCH 1/2] add compatibility with sf6 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 70f0d8f..84247d1 100644 --- a/composer.json +++ b/composer.json @@ -12,10 +12,10 @@ "minimum-stability": "stable", "require": { "php": ">=7.2.5", - "symfony/config": "^5.3", - "symfony/dependency-injection": "^5.3", - "symfony/http-kernel": "^5.3", - "symfony/security-bundle": "^5.3", + "symfony/config": "^6.0", + "symfony/dependency-injection": "^6.0", + "symfony/http-kernel": "^6.0", + "symfony/security-bundle": "^6.0", "guzzlehttp/guzzle": "^6.3", "ext-json": "*" }, From 570008ab6e0cc66c81a0363daca65c60eb94c115 Mon Sep 17 00:00:00 2001 From: el-abdel Date: Sun, 6 Mar 2022 18:49:47 +0100 Subject: [PATCH 2/2] fix compatibility --- ABELkeycloakBearerOnlyAdapterBundle.php | 3 ++- DependencyInjection/ABELkeycloakBearerOnlyAdapterExtension.php | 2 +- Security/User/KeycloakBearerUser.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ABELkeycloakBearerOnlyAdapterBundle.php b/ABELkeycloakBearerOnlyAdapterBundle.php index 05339a6..f0f8bc4 100644 --- a/ABELkeycloakBearerOnlyAdapterBundle.php +++ b/ABELkeycloakBearerOnlyAdapterBundle.php @@ -5,6 +5,7 @@ namespace ABEL\Bundle\keycloakBearerOnlyAdapterBundle; use ABEL\Bundle\keycloakBearerOnlyAdapterBundle\DependencyInjection\ABELkeycloakBearerOnlyAdapterExtension; +use Symfony\Component\DependencyInjection\Extension\ExtensionInterface; use Symfony\Component\HttpKernel\Bundle\Bundle; class ABELkeycloakBearerOnlyAdapterBundle extends Bundle @@ -12,7 +13,7 @@ class ABELkeycloakBearerOnlyAdapterBundle extends Bundle /** * @return ExtensionInterface|null */ - public function getContainerExtension() + public function getContainerExtension(): ?ExtensionInterface { if (null === $this->extension) { $this->extension = new ABELkeycloakBearerOnlyAdapterExtension(); diff --git a/DependencyInjection/ABELkeycloakBearerOnlyAdapterExtension.php b/DependencyInjection/ABELkeycloakBearerOnlyAdapterExtension.php index a568b33..fa685c6 100644 --- a/DependencyInjection/ABELkeycloakBearerOnlyAdapterExtension.php +++ b/DependencyInjection/ABELkeycloakBearerOnlyAdapterExtension.php @@ -27,7 +27,7 @@ class ABELkeycloakBearerOnlyAdapterExtension extends Extension $definition->replaceArgument(4, $config['ssl_verification']); } - public function getAlias() + public function getAlias(): string { return 'abel_keycloak_bearer_only_adapter'; } diff --git a/Security/User/KeycloakBearerUser.php b/Security/User/KeycloakBearerUser.php index 84eca85..7edd42c 100644 --- a/Security/User/KeycloakBearerUser.php +++ b/Security/User/KeycloakBearerUser.php @@ -202,7 +202,7 @@ class KeycloakBearerUser implements UserInterface, \Serializable * * @return array (Role|string)[] The user roles */ - public function getRoles() + public function getRoles(): array { return $this->roles; }