From 6d99aa9f5edbea2d5d65d7593b6fec681522d5a6 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Wed, 1 Feb 2023 15:45:57 +0100 Subject: [PATCH] Drop legacy PHP support --- .github/workflows/ci.yaml | 4 ++-- composer.json | 2 +- src/Client/ClientRegistry.php | 6 ++---- src/Client/OAuth2Client.php | 9 +++------ src/Client/OAuth2PKCEClient.php | 3 +-- src/DependencyInjection/Configuration.php | 4 +--- .../KnpUOAuth2ClientExtension.php | 9 +++------ src/DependencyInjection/ProviderFactory.php | 3 +-- .../Providers/AmazonProviderConfigurator.php | 3 ++- .../Providers/AppIdProviderConfigurator.php | 3 ++- .../Providers/AppleProviderConfigurator.php | 3 ++- .../Providers/Auth0ProviderConfigurator.php | 3 ++- .../Providers/AzureProviderConfigurator.php | 11 ++++------- .../Providers/BitbucketProviderConfigurator.php | 3 ++- .../Providers/BoxProviderConfigurator.php | 3 ++- .../Providers/BuddyProviderConfigurator.php | 3 ++- .../Providers/BufferProviderConfigurator.php | 3 ++- .../Providers/CanvasLMSProviderConfigurator.php | 3 ++- .../Providers/CleverProviderConfigurator.php | 3 ++- .../Providers/DevianArtProviderConfigurator.php | 3 ++- .../DigitalOceanProviderConfigurator.php | 3 ++- .../Providers/DiscordProviderConfigurator.php | 3 ++- .../Providers/DribbbleProviderConfigurator.php | 3 ++- .../Providers/DropboxProviderConfigurator.php | 3 ++- .../Providers/DrupalProviderConfigurator.php | 3 ++- .../Providers/ElanceProviderConfigurator.php | 3 ++- .../Providers/EveOnlineProviderConfigurator.php | 3 ++- .../Providers/EventbriteProviderConfigurator.php | 3 ++- .../Providers/FacebookProviderConfigurator.php | 6 ++++-- .../Providers/FitbitProviderConfigurator.php | 3 ++- .../Providers/FoursquareProviderConfigurator.php | 3 ++- .../Providers/GenericProviderConfigurator.php | 3 ++- .../Providers/GithubProviderConfigurator.php | 3 ++- .../Providers/GitlabProviderConfigurator.php | 3 ++- .../Providers/GoogleProviderConfigurator.php | 3 ++- .../Providers/HeadHunterProviderConfigurator.php | 3 ++- .../Providers/HerokuProviderConfigurator.php | 3 ++- .../Providers/KeycloakProviderConfigurator.php | 3 ++- .../Providers/LinkedInProviderConfigurator.php | 3 ++- .../Providers/MailRuProviderConfigurator.php | 3 ++- .../Providers/MicrosoftProviderConfigurator.php | 3 ++- .../Providers/MollieProviderConfigurator.php | 3 ++- .../OdnoklassnikiProviderConfigurator.php | 3 ++- .../Providers/OktaProviderConfigurator.php | 3 ++- .../Providers/PaypalProviderConfigurator.php | 3 ++- .../Providers/PsnProviderConfigurator.php | 3 ++- .../Providers/SalesforceProviderConfigurator.php | 3 ++- .../Providers/SlackProviderConfigurator.php | 3 ++- .../Providers/StravaProviderConfigurator.php | 3 ++- .../Providers/StripeProviderConfigurator.php | 3 ++- .../SymfonyConnectProviderConfigurator.php | 3 ++- .../Providers/TwitchProviderConfigurator.php | 3 ++- .../Providers/UberProviderConfigurator.php | 3 ++- .../Providers/UnsplashProviderConfigurator.php | 3 ++- .../Providers/VKontakteProviderConfigurator.php | 3 ++- .../Providers/VimeoProviderConfigurator.php | 3 ++- .../Providers/WaveProviderConfigurator.php | 3 ++- .../Providers/YahooProviderConfigurator.php | 3 ++- .../Providers/YandexProviderConfigurator.php | 3 ++- .../Providers/ZendeskProviderConfigurator.php | 3 ++- src/Security/User/OAuthUser.php | 2 +- src/Security/User/OAuthUserProvider.php | 2 +- tests/Client/OAuth2ClientTest.php | 11 +++++------ tests/Client/OAuth2PKCEClientTest.php | 11 ++++++----- .../KnpUOAuth2ClientExtensionTest.php | 16 +++++++++------- tests/FunctionalTest.php | 6 ++++-- .../Helper/FinishRegistrationBehaviorTest.php | 2 +- tests/Security/Helper/PreviousUrlHelperTest.php | 3 ++- 68 files changed, 151 insertions(+), 109 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b753ca3..c321fe91 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,12 +16,12 @@ jobs: fail-fast: false matrix: # normal, highest, non-dev installs - php-version: ['7.3', '7.4', '8.0', '8.1', '8.2'] + php-version: ['7.4', '8.0', '8.1', '8.2'] composer-options: ['--prefer-stable'] dependency-versions: ['highest'] include: # testing lowest php with lowest dependencies - - php-version: '7.2' + - php-version: '7.4' dependency-versions: 'lowest' composer-options: '--prefer-lowest' # testing dev versions with highest PHP diff --git a/composer.json b/composer.json index 07ff8418..1899c15d 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ } ], "require": { - "php": ">=7.2.5", + "php": ">=7.4", "symfony/framework-bundle": "^4.4|^5.0|^6.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/routing": "^4.4|^5.0|^6.0", diff --git a/src/Client/ClientRegistry.php b/src/Client/ClientRegistry.php index 8f41bcf1..ca3e7b82 100644 --- a/src/Client/ClientRegistry.php +++ b/src/Client/ClientRegistry.php @@ -14,11 +14,9 @@ class ClientRegistry { - /** @var ContainerInterface */ - private $container; + private ContainerInterface $container; - /** @var array */ - private $serviceMap; + private array $serviceMap; /** * ClientRegistry constructor. diff --git a/src/Client/OAuth2Client.php b/src/Client/OAuth2Client.php index bf01b2fe..935da335 100644 --- a/src/Client/OAuth2Client.php +++ b/src/Client/OAuth2Client.php @@ -23,14 +23,11 @@ class OAuth2Client implements OAuth2ClientInterface { public const OAUTH2_SESSION_STATE_KEY = 'knpu.oauth2_client_state'; - /** @var AbstractProvider */ - private $provider; + private AbstractProvider $provider; - /** @var RequestStack */ - private $requestStack; + private RequestStack $requestStack; - /** @var bool */ - private $isStateless = false; + private bool $isStateless = false; /** * OAuth2Client constructor. diff --git a/src/Client/OAuth2PKCEClient.php b/src/Client/OAuth2PKCEClient.php index 3f7f9bf0..6d42db83 100644 --- a/src/Client/OAuth2PKCEClient.php +++ b/src/Client/OAuth2PKCEClient.php @@ -27,8 +27,7 @@ class OAuth2PKCEClient extends OAuth2Client { public const VERIFIER_KEY = 'pkce_code_verifier'; - /** @var RequestStack */ - private $requestStack; + private RequestStack $requestStack; public function __construct(AbstractProvider $provider, RequestStack $requestStack) diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index b73b832d..ca93d9f2 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -46,9 +46,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->end() ->end() ->validate() - ->ifTrue(function ($v) { - return isset($v['http_client_options'], $v['http_client']) && !empty($v['http_client_options']); - }) + ->ifTrue(fn ($v) => isset($v['http_client_options'], $v['http_client']) && !empty($v['http_client_options'])) ->thenInvalid('You cannot use both "http_client_options" and "http_client" at the same time under "knpu_oauth2_client".') ->end() ; diff --git a/src/DependencyInjection/KnpUOAuth2ClientExtension.php b/src/DependencyInjection/KnpUOAuth2ClientExtension.php index 1b650621..ac0d819d 100644 --- a/src/DependencyInjection/KnpUOAuth2ClientExtension.php +++ b/src/DependencyInjection/KnpUOAuth2ClientExtension.php @@ -86,14 +86,11 @@ class KnpUOAuth2ClientExtension extends Extension /** @var bool */ private $checkExternalClassExistence; - /** @var array */ - private $configurators = []; + private array $configurators = []; - /** @var array */ - private $duplicateProviderTypes = []; + private array $duplicateProviderTypes = []; - /** @var array */ - private static $supportedProviderTypes = [ + private static array $supportedProviderTypes = [ 'amazon' => AmazonProviderConfigurator::class, 'appid' => AppIdProviderConfigurator::class, 'apple' => AppleProviderConfigurator::class, diff --git a/src/DependencyInjection/ProviderFactory.php b/src/DependencyInjection/ProviderFactory.php index ac62e289..debe581c 100644 --- a/src/DependencyInjection/ProviderFactory.php +++ b/src/DependencyInjection/ProviderFactory.php @@ -19,8 +19,7 @@ */ class ProviderFactory { - /** @var UrlGeneratorInterface */ - private $generator; + private UrlGeneratorInterface $generator; /** * ProviderFactory constructor. diff --git a/src/DependencyInjection/Providers/AmazonProviderConfigurator.php b/src/DependencyInjection/Providers/AmazonProviderConfigurator.php index 73f8bf59..9dce3f4d 100644 --- a/src/DependencyInjection/Providers/AmazonProviderConfigurator.php +++ b/src/DependencyInjection/Providers/AmazonProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\AmazonClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class AmazonProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\AmazonClient'; + return AmazonClient::class; } } diff --git a/src/DependencyInjection/Providers/AppIdProviderConfigurator.php b/src/DependencyInjection/Providers/AppIdProviderConfigurator.php index e81caab8..c103a68d 100644 --- a/src/DependencyInjection/Providers/AppIdProviderConfigurator.php +++ b/src/DependencyInjection/Providers/AppIdProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\AppIdClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; /** @@ -47,7 +48,7 @@ public function getProviderClass(array $configuration) public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\AppIdClient'; + return AppIdClient::class; } public function getProviderOptions(array $configuration) diff --git a/src/DependencyInjection/Providers/AppleProviderConfigurator.php b/src/DependencyInjection/Providers/AppleProviderConfigurator.php index b4ed3b00..0e3df7e7 100644 --- a/src/DependencyInjection/Providers/AppleProviderConfigurator.php +++ b/src/DependencyInjection/Providers/AppleProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\AppleClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class AppleProviderConfigurator implements ProviderConfiguratorInterface, ProviderWithoutClientSecretConfiguratorInterface @@ -41,7 +42,7 @@ public function getProviderClass(array $configuration) public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\AppleClient'; + return AppleClient::class; } public function getProviderOptions(array $configuration) diff --git a/src/DependencyInjection/Providers/Auth0ProviderConfigurator.php b/src/DependencyInjection/Providers/Auth0ProviderConfigurator.php index dad001a9..47d328ab 100644 --- a/src/DependencyInjection/Providers/Auth0ProviderConfigurator.php +++ b/src/DependencyInjection/Providers/Auth0ProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\Auth0Client; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class Auth0ProviderConfigurator implements ProviderConfiguratorInterface @@ -65,6 +66,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\Auth0Client'; + return Auth0Client::class; } } diff --git a/src/DependencyInjection/Providers/AzureProviderConfigurator.php b/src/DependencyInjection/Providers/AzureProviderConfigurator.php index 58d9556b..cbe61158 100644 --- a/src/DependencyInjection/Providers/AzureProviderConfigurator.php +++ b/src/DependencyInjection/Providers/AzureProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\AzureClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class AzureProviderConfigurator implements ProviderConfiguratorInterface, ProviderWithoutClientSecretConfiguratorInterface @@ -90,15 +91,11 @@ public function buildConfiguration(NodeBuilder $node) $node ->end() ->validate() - ->ifTrue(function ($v) { - return empty($v['client_secret']) && empty($v['client_certificate_private_key']); - }) + ->ifTrue(fn ($v) => empty($v['client_secret']) && empty($v['client_certificate_private_key'])) ->thenInvalid('You have to define either client_secret or client_certificate_private_key') ->end() ->validate() - ->ifTrue(function ($v) { - return !empty($v['client_certificate_private_key']) && empty($v['client_certificate_thumbprint']); - }) + ->ifTrue(fn ($v) => !empty($v['client_certificate_private_key']) && empty($v['client_certificate_thumbprint'])) ->thenInvalid('You have to define the client_certificate_thumbprint when using a certificate') ->end(); } @@ -145,6 +142,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\AzureClient'; + return AzureClient::class; } } diff --git a/src/DependencyInjection/Providers/BitbucketProviderConfigurator.php b/src/DependencyInjection/Providers/BitbucketProviderConfigurator.php index c5404ad0..a1950342 100644 --- a/src/DependencyInjection/Providers/BitbucketProviderConfigurator.php +++ b/src/DependencyInjection/Providers/BitbucketProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\BitbucketClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class BitbucketProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\BitbucketClient'; + return BitbucketClient::class; } } diff --git a/src/DependencyInjection/Providers/BoxProviderConfigurator.php b/src/DependencyInjection/Providers/BoxProviderConfigurator.php index 23410521..dfd0c844 100644 --- a/src/DependencyInjection/Providers/BoxProviderConfigurator.php +++ b/src/DependencyInjection/Providers/BoxProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\BoxClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class BoxProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\BoxClient'; + return BoxClient::class; } } diff --git a/src/DependencyInjection/Providers/BuddyProviderConfigurator.php b/src/DependencyInjection/Providers/BuddyProviderConfigurator.php index 86ffd41d..330c7451 100644 --- a/src/DependencyInjection/Providers/BuddyProviderConfigurator.php +++ b/src/DependencyInjection/Providers/BuddyProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\BuddyClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class BuddyProviderConfigurator implements ProviderConfiguratorInterface @@ -55,6 +56,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\BuddyClient'; + return BuddyClient::class; } } diff --git a/src/DependencyInjection/Providers/BufferProviderConfigurator.php b/src/DependencyInjection/Providers/BufferProviderConfigurator.php index e40781d9..b258f92d 100644 --- a/src/DependencyInjection/Providers/BufferProviderConfigurator.php +++ b/src/DependencyInjection/Providers/BufferProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\BufferClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class BufferProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\BufferClient'; + return BufferClient::class; } } diff --git a/src/DependencyInjection/Providers/CanvasLMSProviderConfigurator.php b/src/DependencyInjection/Providers/CanvasLMSProviderConfigurator.php index 764bb424..063792ee 100644 --- a/src/DependencyInjection/Providers/CanvasLMSProviderConfigurator.php +++ b/src/DependencyInjection/Providers/CanvasLMSProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\CanvasLMSClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class CanvasLMSProviderConfigurator implements ProviderConfiguratorInterface @@ -64,6 +65,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\CanvasLMSClient'; + return CanvasLMSClient::class; } } diff --git a/src/DependencyInjection/Providers/CleverProviderConfigurator.php b/src/DependencyInjection/Providers/CleverProviderConfigurator.php index 31dbed4f..8927a61b 100644 --- a/src/DependencyInjection/Providers/CleverProviderConfigurator.php +++ b/src/DependencyInjection/Providers/CleverProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\CleverClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class CleverProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\CleverClient'; + return CleverClient::class; } } diff --git a/src/DependencyInjection/Providers/DevianArtProviderConfigurator.php b/src/DependencyInjection/Providers/DevianArtProviderConfigurator.php index e7f9cdd4..9da43f52 100644 --- a/src/DependencyInjection/Providers/DevianArtProviderConfigurator.php +++ b/src/DependencyInjection/Providers/DevianArtProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\DevianArtClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class DevianArtProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\DevianArtClient'; + return DevianArtClient::class; } } diff --git a/src/DependencyInjection/Providers/DigitalOceanProviderConfigurator.php b/src/DependencyInjection/Providers/DigitalOceanProviderConfigurator.php index 6fc5da11..8fc75c6e 100644 --- a/src/DependencyInjection/Providers/DigitalOceanProviderConfigurator.php +++ b/src/DependencyInjection/Providers/DigitalOceanProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\DigitalOceanClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class DigitalOceanProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\DigitalOceanClient'; + return DigitalOceanClient::class; } } diff --git a/src/DependencyInjection/Providers/DiscordProviderConfigurator.php b/src/DependencyInjection/Providers/DiscordProviderConfigurator.php index 6c60baaf..eae23027 100644 --- a/src/DependencyInjection/Providers/DiscordProviderConfigurator.php +++ b/src/DependencyInjection/Providers/DiscordProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\DiscordClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class DiscordProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\DiscordClient'; + return DiscordClient::class; } } diff --git a/src/DependencyInjection/Providers/DribbbleProviderConfigurator.php b/src/DependencyInjection/Providers/DribbbleProviderConfigurator.php index 91b0c672..abe1714c 100644 --- a/src/DependencyInjection/Providers/DribbbleProviderConfigurator.php +++ b/src/DependencyInjection/Providers/DribbbleProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\DribbbleClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class DribbbleProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\DribbbleClient'; + return DribbbleClient::class; } } diff --git a/src/DependencyInjection/Providers/DropboxProviderConfigurator.php b/src/DependencyInjection/Providers/DropboxProviderConfigurator.php index 277dc842..e15d38fb 100644 --- a/src/DependencyInjection/Providers/DropboxProviderConfigurator.php +++ b/src/DependencyInjection/Providers/DropboxProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\DropboxClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class DropboxProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\DropboxClient'; + return DropboxClient::class; } } diff --git a/src/DependencyInjection/Providers/DrupalProviderConfigurator.php b/src/DependencyInjection/Providers/DrupalProviderConfigurator.php index 92b689ac..9f13999f 100644 --- a/src/DependencyInjection/Providers/DrupalProviderConfigurator.php +++ b/src/DependencyInjection/Providers/DrupalProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\DrupalClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class DrupalProviderConfigurator implements ProviderConfiguratorInterface @@ -56,6 +57,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\DrupalClient'; + return DrupalClient::class; } } diff --git a/src/DependencyInjection/Providers/ElanceProviderConfigurator.php b/src/DependencyInjection/Providers/ElanceProviderConfigurator.php index dbae4b61..08403d5e 100644 --- a/src/DependencyInjection/Providers/ElanceProviderConfigurator.php +++ b/src/DependencyInjection/Providers/ElanceProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\ElanceClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class ElanceProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\ElanceClient'; + return ElanceClient::class; } } diff --git a/src/DependencyInjection/Providers/EveOnlineProviderConfigurator.php b/src/DependencyInjection/Providers/EveOnlineProviderConfigurator.php index 03d69dcb..47199b65 100644 --- a/src/DependencyInjection/Providers/EveOnlineProviderConfigurator.php +++ b/src/DependencyInjection/Providers/EveOnlineProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\EveOnlineClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class EveOnlineProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\EveOnlineClient'; + return EveOnlineClient::class; } } diff --git a/src/DependencyInjection/Providers/EventbriteProviderConfigurator.php b/src/DependencyInjection/Providers/EventbriteProviderConfigurator.php index 43d80d6c..63d408f6 100644 --- a/src/DependencyInjection/Providers/EventbriteProviderConfigurator.php +++ b/src/DependencyInjection/Providers/EventbriteProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\EventbriteClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class EventbriteProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\EventbriteClient'; + return EventbriteClient::class; } } diff --git a/src/DependencyInjection/Providers/FacebookProviderConfigurator.php b/src/DependencyInjection/Providers/FacebookProviderConfigurator.php index 4ac27186..15021626 100644 --- a/src/DependencyInjection/Providers/FacebookProviderConfigurator.php +++ b/src/DependencyInjection/Providers/FacebookProviderConfigurator.php @@ -10,6 +10,8 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\FacebookClient; +use League\OAuth2\Client\Provider\Facebook; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class FacebookProviderConfigurator implements ProviderConfiguratorInterface @@ -26,7 +28,7 @@ public function buildConfiguration(NodeBuilder $node) public function getProviderClass(array $config) { - return 'League\OAuth2\Client\Provider\Facebook'; + return Facebook::class; } public function getProviderOptions(array $config) @@ -55,6 +57,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\FacebookClient'; + return FacebookClient::class; } } diff --git a/src/DependencyInjection/Providers/FitbitProviderConfigurator.php b/src/DependencyInjection/Providers/FitbitProviderConfigurator.php index f6c7169f..51f45579 100644 --- a/src/DependencyInjection/Providers/FitbitProviderConfigurator.php +++ b/src/DependencyInjection/Providers/FitbitProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\FitbitClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class FitbitProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\FitbitClient'; + return FitbitClient::class; } } diff --git a/src/DependencyInjection/Providers/FoursquareProviderConfigurator.php b/src/DependencyInjection/Providers/FoursquareProviderConfigurator.php index 6055cdfd..58c5c016 100644 --- a/src/DependencyInjection/Providers/FoursquareProviderConfigurator.php +++ b/src/DependencyInjection/Providers/FoursquareProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\FoursquareClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class FoursquareProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\FoursquareClient'; + return FoursquareClient::class; } } diff --git a/src/DependencyInjection/Providers/GenericProviderConfigurator.php b/src/DependencyInjection/Providers/GenericProviderConfigurator.php index 458a65c8..004fec6e 100644 --- a/src/DependencyInjection/Providers/GenericProviderConfigurator.php +++ b/src/DependencyInjection/Providers/GenericProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\OAuth2Client; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class GenericProviderConfigurator implements ProviderConfiguratorInterface @@ -23,7 +24,7 @@ public function buildConfiguration(NodeBuilder $node) ->end() ->scalarNode('client_class') ->info('If you have a sub-class of OAuth2Client you want to use, add it here') - ->defaultValue('KnpU\OAuth2ClientBundle\Client\OAuth2Client') + ->defaultValue(OAuth2Client::class) ->end() ->arrayNode('provider_options') ->info('Other options to pass to your provider\'s constructor') diff --git a/src/DependencyInjection/Providers/GithubProviderConfigurator.php b/src/DependencyInjection/Providers/GithubProviderConfigurator.php index 7c72734c..6bc43743 100644 --- a/src/DependencyInjection/Providers/GithubProviderConfigurator.php +++ b/src/DependencyInjection/Providers/GithubProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\GithubClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class GithubProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\GithubClient'; + return GithubClient::class; } } diff --git a/src/DependencyInjection/Providers/GitlabProviderConfigurator.php b/src/DependencyInjection/Providers/GitlabProviderConfigurator.php index 224da66f..8cfbe334 100644 --- a/src/DependencyInjection/Providers/GitlabProviderConfigurator.php +++ b/src/DependencyInjection/Providers/GitlabProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\GitlabClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; /** @@ -60,6 +61,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\GitlabClient'; + return GitlabClient::class; } } diff --git a/src/DependencyInjection/Providers/GoogleProviderConfigurator.php b/src/DependencyInjection/Providers/GoogleProviderConfigurator.php index 73d92914..7b33e862 100644 --- a/src/DependencyInjection/Providers/GoogleProviderConfigurator.php +++ b/src/DependencyInjection/Providers/GoogleProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\GoogleClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class GoogleProviderConfigurator implements ProviderConfiguratorInterface @@ -83,6 +84,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\GoogleClient'; + return GoogleClient::class; } } diff --git a/src/DependencyInjection/Providers/HeadHunterProviderConfigurator.php b/src/DependencyInjection/Providers/HeadHunterProviderConfigurator.php index cfe6837f..2495e318 100644 --- a/src/DependencyInjection/Providers/HeadHunterProviderConfigurator.php +++ b/src/DependencyInjection/Providers/HeadHunterProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\HeadHunterClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class HeadHunterProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\HeadHunterClient'; + return HeadHunterClient::class; } } diff --git a/src/DependencyInjection/Providers/HerokuProviderConfigurator.php b/src/DependencyInjection/Providers/HerokuProviderConfigurator.php index d45212fe..ea8cd6f7 100644 --- a/src/DependencyInjection/Providers/HerokuProviderConfigurator.php +++ b/src/DependencyInjection/Providers/HerokuProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\HerokuClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class HerokuProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\HerokuClient'; + return HerokuClient::class; } } diff --git a/src/DependencyInjection/Providers/KeycloakProviderConfigurator.php b/src/DependencyInjection/Providers/KeycloakProviderConfigurator.php index 9916be57..31be9c35 100644 --- a/src/DependencyInjection/Providers/KeycloakProviderConfigurator.php +++ b/src/DependencyInjection/Providers/KeycloakProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\KeycloakClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class KeycloakProviderConfigurator implements ProviderConfiguratorInterface @@ -79,6 +80,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\KeycloakClient'; + return KeycloakClient::class; } } diff --git a/src/DependencyInjection/Providers/LinkedInProviderConfigurator.php b/src/DependencyInjection/Providers/LinkedInProviderConfigurator.php index 538c6f76..e6c3922c 100644 --- a/src/DependencyInjection/Providers/LinkedInProviderConfigurator.php +++ b/src/DependencyInjection/Providers/LinkedInProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\LinkedInClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class LinkedInProviderConfigurator implements ProviderConfiguratorInterface @@ -68,6 +69,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\LinkedInClient'; + return LinkedInClient::class; } } diff --git a/src/DependencyInjection/Providers/MailRuProviderConfigurator.php b/src/DependencyInjection/Providers/MailRuProviderConfigurator.php index b76c9296..a7558aa4 100644 --- a/src/DependencyInjection/Providers/MailRuProviderConfigurator.php +++ b/src/DependencyInjection/Providers/MailRuProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\MailRuClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class MailRuProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\MailRuClient'; + return MailRuClient::class; } } diff --git a/src/DependencyInjection/Providers/MicrosoftProviderConfigurator.php b/src/DependencyInjection/Providers/MicrosoftProviderConfigurator.php index d6bb7b8d..51807319 100644 --- a/src/DependencyInjection/Providers/MicrosoftProviderConfigurator.php +++ b/src/DependencyInjection/Providers/MicrosoftProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\MicrosoftClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class MicrosoftProviderConfigurator implements ProviderConfiguratorInterface @@ -76,6 +77,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\MicrosoftClient'; + return MicrosoftClient::class; } } diff --git a/src/DependencyInjection/Providers/MollieProviderConfigurator.php b/src/DependencyInjection/Providers/MollieProviderConfigurator.php index 04431363..849a8300 100644 --- a/src/DependencyInjection/Providers/MollieProviderConfigurator.php +++ b/src/DependencyInjection/Providers/MollieProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\MollieClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class MollieProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\MollieClient'; + return MollieClient::class; } } diff --git a/src/DependencyInjection/Providers/OdnoklassnikiProviderConfigurator.php b/src/DependencyInjection/Providers/OdnoklassnikiProviderConfigurator.php index ad11a715..5e1ab1b3 100644 --- a/src/DependencyInjection/Providers/OdnoklassnikiProviderConfigurator.php +++ b/src/DependencyInjection/Providers/OdnoklassnikiProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\OdnoklassnikiClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class OdnoklassnikiProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\OdnoklassnikiClient'; + return OdnoklassnikiClient::class; } } diff --git a/src/DependencyInjection/Providers/OktaProviderConfigurator.php b/src/DependencyInjection/Providers/OktaProviderConfigurator.php index 575657db..d1865fae 100644 --- a/src/DependencyInjection/Providers/OktaProviderConfigurator.php +++ b/src/DependencyInjection/Providers/OktaProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\OktaClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class OktaProviderConfigurator implements ProviderConfiguratorInterface @@ -60,6 +61,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\OktaClient'; + return OktaClient::class; } } diff --git a/src/DependencyInjection/Providers/PaypalProviderConfigurator.php b/src/DependencyInjection/Providers/PaypalProviderConfigurator.php index 11a0d0a2..4b63b575 100644 --- a/src/DependencyInjection/Providers/PaypalProviderConfigurator.php +++ b/src/DependencyInjection/Providers/PaypalProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\PaypalClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class PaypalProviderConfigurator implements ProviderConfiguratorInterface @@ -55,6 +56,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\PaypalClient'; + return PaypalClient::class; } } diff --git a/src/DependencyInjection/Providers/PsnProviderConfigurator.php b/src/DependencyInjection/Providers/PsnProviderConfigurator.php index a13ccd45..7ab31ad7 100644 --- a/src/DependencyInjection/Providers/PsnProviderConfigurator.php +++ b/src/DependencyInjection/Providers/PsnProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\PsnClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class PsnProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\PsnClient'; + return PsnClient::class; } } diff --git a/src/DependencyInjection/Providers/SalesforceProviderConfigurator.php b/src/DependencyInjection/Providers/SalesforceProviderConfigurator.php index e1d5b546..700cb232 100644 --- a/src/DependencyInjection/Providers/SalesforceProviderConfigurator.php +++ b/src/DependencyInjection/Providers/SalesforceProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\SalesforceClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class SalesforceProviderConfigurator implements ProviderConfiguratorInterface @@ -55,6 +56,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\SalesforceClient'; + return SalesforceClient::class; } } diff --git a/src/DependencyInjection/Providers/SlackProviderConfigurator.php b/src/DependencyInjection/Providers/SlackProviderConfigurator.php index ad651e18..5879496d 100644 --- a/src/DependencyInjection/Providers/SlackProviderConfigurator.php +++ b/src/DependencyInjection/Providers/SlackProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\SlackClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class SlackProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\SlackClient'; + return SlackClient::class; } } diff --git a/src/DependencyInjection/Providers/StravaProviderConfigurator.php b/src/DependencyInjection/Providers/StravaProviderConfigurator.php index 96f41ed0..e42669bd 100644 --- a/src/DependencyInjection/Providers/StravaProviderConfigurator.php +++ b/src/DependencyInjection/Providers/StravaProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\StravaClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class StravaProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\StravaClient'; + return StravaClient::class; } } diff --git a/src/DependencyInjection/Providers/StripeProviderConfigurator.php b/src/DependencyInjection/Providers/StripeProviderConfigurator.php index 164df1c7..99e9eee1 100644 --- a/src/DependencyInjection/Providers/StripeProviderConfigurator.php +++ b/src/DependencyInjection/Providers/StripeProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\StripeClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class StripeProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\StripeClient'; + return StripeClient::class; } } diff --git a/src/DependencyInjection/Providers/SymfonyConnectProviderConfigurator.php b/src/DependencyInjection/Providers/SymfonyConnectProviderConfigurator.php index 41d2358a..220d81b7 100644 --- a/src/DependencyInjection/Providers/SymfonyConnectProviderConfigurator.php +++ b/src/DependencyInjection/Providers/SymfonyConnectProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\SymfonyConnectClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class SymfonyConnectProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\SymfonyConnectClient'; + return SymfonyConnectClient::class; } } diff --git a/src/DependencyInjection/Providers/TwitchProviderConfigurator.php b/src/DependencyInjection/Providers/TwitchProviderConfigurator.php index c7b3d9df..d1bebff4 100644 --- a/src/DependencyInjection/Providers/TwitchProviderConfigurator.php +++ b/src/DependencyInjection/Providers/TwitchProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\TwitchClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class TwitchProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\TwitchClient'; + return TwitchClient::class; } } diff --git a/src/DependencyInjection/Providers/UberProviderConfigurator.php b/src/DependencyInjection/Providers/UberProviderConfigurator.php index 02c5082b..03fe880d 100644 --- a/src/DependencyInjection/Providers/UberProviderConfigurator.php +++ b/src/DependencyInjection/Providers/UberProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\UberClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class UberProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\UberClient'; + return UberClient::class; } } diff --git a/src/DependencyInjection/Providers/UnsplashProviderConfigurator.php b/src/DependencyInjection/Providers/UnsplashProviderConfigurator.php index bec379c4..2e341a2f 100644 --- a/src/DependencyInjection/Providers/UnsplashProviderConfigurator.php +++ b/src/DependencyInjection/Providers/UnsplashProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\UnsplashClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class UnsplashProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\UnsplashClient'; + return UnsplashClient::class; } } diff --git a/src/DependencyInjection/Providers/VKontakteProviderConfigurator.php b/src/DependencyInjection/Providers/VKontakteProviderConfigurator.php index 0c69e96c..d64c3ebd 100644 --- a/src/DependencyInjection/Providers/VKontakteProviderConfigurator.php +++ b/src/DependencyInjection/Providers/VKontakteProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\VKontakteClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class VKontakteProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\VKontakteClient'; + return VKontakteClient::class; } } diff --git a/src/DependencyInjection/Providers/VimeoProviderConfigurator.php b/src/DependencyInjection/Providers/VimeoProviderConfigurator.php index 5b838afd..52aaa6cd 100644 --- a/src/DependencyInjection/Providers/VimeoProviderConfigurator.php +++ b/src/DependencyInjection/Providers/VimeoProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\VimeoClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class VimeoProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\VimeoClient'; + return VimeoClient::class; } } diff --git a/src/DependencyInjection/Providers/WaveProviderConfigurator.php b/src/DependencyInjection/Providers/WaveProviderConfigurator.php index 7574f1e9..9b8a6648 100644 --- a/src/DependencyInjection/Providers/WaveProviderConfigurator.php +++ b/src/DependencyInjection/Providers/WaveProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\WaveClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class WaveProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\WaveClient'; + return WaveClient::class; } } diff --git a/src/DependencyInjection/Providers/YahooProviderConfigurator.php b/src/DependencyInjection/Providers/YahooProviderConfigurator.php index 97764c80..ae127d6f 100644 --- a/src/DependencyInjection/Providers/YahooProviderConfigurator.php +++ b/src/DependencyInjection/Providers/YahooProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\YahooClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class YahooProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\YahooClient'; + return YahooClient::class; } } diff --git a/src/DependencyInjection/Providers/YandexProviderConfigurator.php b/src/DependencyInjection/Providers/YandexProviderConfigurator.php index 6b10cb8d..1d601ae6 100644 --- a/src/DependencyInjection/Providers/YandexProviderConfigurator.php +++ b/src/DependencyInjection/Providers/YandexProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\YandexClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class YandexProviderConfigurator implements ProviderConfiguratorInterface @@ -49,6 +50,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\YandexClient'; + return YandexClient::class; } } diff --git a/src/DependencyInjection/Providers/ZendeskProviderConfigurator.php b/src/DependencyInjection/Providers/ZendeskProviderConfigurator.php index 9568beeb..bd47361d 100644 --- a/src/DependencyInjection/Providers/ZendeskProviderConfigurator.php +++ b/src/DependencyInjection/Providers/ZendeskProviderConfigurator.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers; +use KnpU\OAuth2ClientBundle\Client\Provider\ZendeskClient; use Symfony\Component\Config\Definition\Builder\NodeBuilder; class ZendeskProviderConfigurator implements ProviderConfiguratorInterface @@ -55,6 +56,6 @@ public function getProviderDisplayName() public function getClientClass(array $config) { - return 'KnpU\OAuth2ClientBundle\Client\Provider\ZendeskClient'; + return ZendeskClient::class; } } diff --git a/src/Security/User/OAuthUser.php b/src/Security/User/OAuthUser.php index 0b3e1fb7..b3c4ad71 100644 --- a/src/Security/User/OAuthUser.php +++ b/src/Security/User/OAuthUser.php @@ -15,7 +15,7 @@ class OAuthUser implements UserInterface { private $username; - private $roles; + private array $roles; public function __construct($username, array $roles) { diff --git a/src/Security/User/OAuthUserProvider.php b/src/Security/User/OAuthUserProvider.php index ca2ec520..fdd24c50 100644 --- a/src/Security/User/OAuthUserProvider.php +++ b/src/Security/User/OAuthUserProvider.php @@ -16,7 +16,7 @@ class OAuthUserProvider implements UserProviderInterface { - private $roles; + private array $roles; public function __construct(array $roles = ['ROLE_USER', 'ROLE_OAUTH_USER']) { diff --git a/tests/Client/OAuth2ClientTest.php b/tests/Client/OAuth2ClientTest.php index 9abfff74..04759ffa 100644 --- a/tests/Client/OAuth2ClientTest.php +++ b/tests/Client/OAuth2ClientTest.php @@ -26,10 +26,9 @@ class OAuth2ClientTest extends TestCase { - private $requestStack; - /** @var Request */ - private $request; - private $session; + private RequestStack $requestStack; + private Request $request; + private Session $session; private $provider; public function setup(): void @@ -59,7 +58,7 @@ public function testRedirectWithState() $response = $client->redirect(['scope1', 'scope2']); $this->assertInstanceOf( - 'Symfony\Component\HttpFoundation\RedirectResponse', + RedirectResponse::class, $response ); $this->assertEquals( @@ -273,7 +272,7 @@ public function testFetchUser() $this->provider->method('getResourceOwner') ->with($actualToken) ->willReturn($resourceOwner); - $user = $client->fetchUser($actualToken); + $user = $client->fetchUser(); $this->assertInstanceOf(FacebookUser::class, $user); $this->assertEquals('testUser', $user->getName()); diff --git a/tests/Client/OAuth2PKCEClientTest.php b/tests/Client/OAuth2PKCEClientTest.php index 1c9388ed..97237878 100644 --- a/tests/Client/OAuth2PKCEClientTest.php +++ b/tests/Client/OAuth2PKCEClientTest.php @@ -16,6 +16,7 @@ use League\OAuth2\Client\Token\AccessToken; use PHPUnit\Framework\TestCase; use Psr\Http\Message\ResponseInterface; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Session\Session; @@ -23,10 +24,10 @@ class OAuth2PKCEClientTest extends TestCase { - private $requestStack; - private $request; - private $session; - private $provider; + private RequestStack $requestStack; + private Request $request; + private Session $session; + private AbstractProvider $provider; public function setup(): void { @@ -86,7 +87,7 @@ public function testRedirect() $response = $client->redirect(); $this->assertInstanceOf( - 'Symfony\Component\HttpFoundation\RedirectResponse', + RedirectResponse::class, $response ); diff --git a/tests/DependencyInjection/KnpUOAuth2ClientExtensionTest.php b/tests/DependencyInjection/KnpUOAuth2ClientExtensionTest.php index 42aa1b1f..2cf7fc7d 100644 --- a/tests/DependencyInjection/KnpUOAuth2ClientExtensionTest.php +++ b/tests/DependencyInjection/KnpUOAuth2ClientExtensionTest.php @@ -10,8 +10,10 @@ namespace KnpU\OAuth2ClientBundle\tests\DependencyInjection; +use KnpU\OAuth2ClientBundle\Client\Provider\FacebookClient; use KnpU\OAuth2ClientBundle\DependencyInjection\KnpUOAuth2ClientExtension; use KnpU\OAuth2ClientBundle\DependencyInjection\Providers\ProviderConfiguratorInterface; +use League\OAuth2\Client\Provider\Facebook; use Symfony\Component\Config\Definition\ArrayNode; use Symfony\Component\Config\Definition\BooleanNode; use Symfony\Component\Config\Definition\Builder\TreeBuilder; @@ -62,7 +64,7 @@ public function testFacebookProviderMakesService() $this->assertEquals( [ - 'League\OAuth2\Client\Provider\Facebook', + Facebook::class, ['clientId' => 'CLIENT_ID', 'clientSecret' => 'SECRET', 'graphApiVersion' => 'API_VERSION'], 'the_route_name', ['route_params' => 'foo'], @@ -75,7 +77,7 @@ public function testFacebookProviderMakesService() // the custom class is used $clientDefinition = $this->configuration->getDefinition('knpu.oauth2.client.facebook'); $this->assertEquals( - 'KnpU\OAuth2ClientBundle\Client\Provider\FacebookClient', + FacebookClient::class, $clientDefinition->getClass() ); $this->assertEquals( @@ -88,7 +90,7 @@ public function testFacebookProviderMakesService() // the client service has an alias $this->assertTrue( - $this->configuration->hasAlias('KnpU\OAuth2ClientBundle\Client\Provider\FacebookClient'), + $this->configuration->hasAlias(FacebookClient::class), 'FacebookClient service is missing an alias' ); } @@ -150,7 +152,7 @@ public function provideTypesAndConfig() 'client_secret' => 'CLIENT_SECRET_TEST', 'redirect_route' => 'go_there', 'redirect_params' => [], - 'use_state' => rand(0, 1) == 0, + 'use_state' => random_int(0, 1) === 0, ]; if (!KnpUOAuth2ClientExtension::configuratorNeedsClientSecret($configurator)) { @@ -163,11 +165,11 @@ public function provideTypesAndConfig() if ($child instanceof ArrayNode) { $config[$child->getName()] = []; } elseif ($child instanceof BooleanNode) { - $config[$child->getName()] = (bool) rand(0, 1); + $config[$child->getName()] = (bool) random_int(0, 1); } elseif ($child instanceof IntegerNode) { - $config[$child->getName()] = rand(); + $config[$child->getName()] = random_int(0, mt_getrandmax()); } else { - $config[$child->getName()] = 'random_'.rand(); + $config[$child->getName()] = 'random_'.random_int(0, mt_getrandmax()); } } diff --git a/tests/FunctionalTest.php b/tests/FunctionalTest.php index 1dbe772a..c8bbbec6 100644 --- a/tests/FunctionalTest.php +++ b/tests/FunctionalTest.php @@ -11,7 +11,9 @@ namespace KnpU\OAuth2ClientBundle\tests; use GuzzleHttp\Client; +use KnpU\OAuth2ClientBundle\Client\Provider\FacebookClient; use KnpU\OAuth2ClientBundle\Tests\app\TestKernel; +use League\OAuth2\Client\Provider\Facebook; use PHPUnit\Framework\TestCase; class FunctionalTest extends TestCase @@ -25,8 +27,8 @@ public function testServicesAreUsable() /** @var \KnpU\OAuth2ClientBundle\Client\OAuth2Client $client */ $client = $container->get('knpu.oauth2.client.my_facebook'); - $this->assertInstanceOf('KnpU\OAuth2ClientBundle\Client\Provider\FacebookClient', $client); - $this->assertInstanceOf('League\OAuth2\Client\Provider\Facebook', $client->getOAuth2Provider()); + $this->assertInstanceOf(FacebookClient::class, $client); + $this->assertInstanceOf(Facebook::class, $client->getOAuth2Provider()); $client2 = $container->get('knpu.oauth2.registry') ->getClient('my_facebook'); diff --git a/tests/Security/Helper/FinishRegistrationBehaviorTest.php b/tests/Security/Helper/FinishRegistrationBehaviorTest.php index 42bd99ab..0542f896 100644 --- a/tests/Security/Helper/FinishRegistrationBehaviorTest.php +++ b/tests/Security/Helper/FinishRegistrationBehaviorTest.php @@ -26,7 +26,7 @@ class FinishRegistrationBehaviorTest extends TestCase public function setUp(): void { $this->traitObject = $this - ->getMockForTrait('KnpU\OAuth2ClientBundle\Security\Helper\FinishRegistrationBehavior'); + ->getMockForTrait(FinishRegistrationBehavior::class); } public function testGetUserInfoFromSession() diff --git a/tests/Security/Helper/PreviousUrlHelperTest.php b/tests/Security/Helper/PreviousUrlHelperTest.php index 00124209..b6b09689 100644 --- a/tests/Security/Helper/PreviousUrlHelperTest.php +++ b/tests/Security/Helper/PreviousUrlHelperTest.php @@ -10,6 +10,7 @@ namespace KnpU\OAuth2ClientBundle\Tests\Security\Helper; +use KnpU\OAuth2ClientBundle\Security\Helper\PreviousUrlHelper; use PHPUnit\Framework\TestCase; /** @@ -23,7 +24,7 @@ class PreviousUrlHelperTest extends TestCase public function setUp(): void { $this->traitObject = $this - ->getMockForTrait('KnpU\OAuth2ClientBundle\Security\Helper\PreviousUrlHelper'); + ->getMockForTrait(PreviousUrlHelper::class); } public function testGetPreviousUrl()