From 8da63f1c4b944359f38c747e721a8889a1267333 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Thu, 29 Jun 2023 10:53:24 +0200 Subject: [PATCH] Rebuild CI and fix CS --- .github/workflows/ci.yaml | 2 ++ src/DependencyInjection/ProviderFactory.php | 2 -- .../Providers/SpotifyProviderConfigurator.php | 21 ------------------- .../Exception/FinishRegistrationException.php | 1 - .../Helper/FinishRegistrationBehavior.php | 2 -- 5 files changed, 2 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 065f7738..76fa04a3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,6 +19,8 @@ jobs: cs: uses: SymfonyCasts/.github/.github/workflows/php-cs-fixer.yaml@main + with: + php: '7.4' sca: uses: SymfonyCasts/.github/.github/workflows/phpstan.yaml@main diff --git a/src/DependencyInjection/ProviderFactory.php b/src/DependencyInjection/ProviderFactory.php index debe581c..95aa24d8 100644 --- a/src/DependencyInjection/ProviderFactory.php +++ b/src/DependencyInjection/ProviderFactory.php @@ -34,8 +34,6 @@ public function __construct(UrlGeneratorInterface $generator) * * @param string $class * @param string $redirectUri - * - * @return mixed */ public function createProvider($class, array $options, string $redirectUri = null, array $redirectParams = [], array $collaborators = []) { diff --git a/src/DependencyInjection/Providers/SpotifyProviderConfigurator.php b/src/DependencyInjection/Providers/SpotifyProviderConfigurator.php index 7cf16ab1..28768888 100644 --- a/src/DependencyInjection/Providers/SpotifyProviderConfigurator.php +++ b/src/DependencyInjection/Providers/SpotifyProviderConfigurator.php @@ -16,33 +16,21 @@ class SpotifyProviderConfigurator implements ProviderConfiguratorInterface { - /** - * {@inheritdoc} - */ public function buildConfiguration(NodeBuilder $node): void { // no custom options } - /** - * {@inheritdoc} - */ public function getProviderClass(array $configuration): string { return Spotify::class; } - /** - * {@inheritdoc} - */ public function getClientClass(array $config): string { return SpotifyClient::class; } - /** - * {@inheritdoc} - */ public function getProviderOptions(array $configuration): array { return [ @@ -51,25 +39,16 @@ public function getProviderOptions(array $configuration): array ]; } - /** - * {@inheritdoc} - */ public function getPackagistName(): string { return 'kerox/oauth2-spotify'; } - /** - * {@inheritdoc} - */ public function getLibraryHomepage(): string { return 'https://github.com/ker0x/oauth2-spotify'; } - /** - * {@inheritdoc} - */ public function getProviderDisplayName(): string { return 'Spotify'; diff --git a/src/Security/Exception/FinishRegistrationException.php b/src/Security/Exception/FinishRegistrationException.php index a2d5132a..0ed6a5ea 100644 --- a/src/Security/Exception/FinishRegistrationException.php +++ b/src/Security/Exception/FinishRegistrationException.php @@ -10,7 +10,6 @@ namespace KnpU\OAuth2ClientBundle\Security\Exception; -use Exception; use Symfony\Component\Security\Core\Exception\AuthenticationException; /** diff --git a/src/Security/Helper/FinishRegistrationBehavior.php b/src/Security/Helper/FinishRegistrationBehavior.php index 0708d9af..ae7f7602 100644 --- a/src/Security/Helper/FinishRegistrationBehavior.php +++ b/src/Security/Helper/FinishRegistrationBehavior.php @@ -42,8 +42,6 @@ protected function saveUserInfoToSession(Request $request, FinishRegistrationExc /** * Useful during registration to get your user information back out. * - * @return mixed - * * @throws \LogicException */ public function getUserInfoFromSession(Request $request)