From 9c5286eb173430e2ded026faf3870b0a6b8809d9 Mon Sep 17 00:00:00 2001 From: Jesse Rushlow Date: Fri, 27 Aug 2021 10:05:42 -0400 Subject: [PATCH] add symfony 6 return types --- .../KnpUOAuth2ClientExtension.php | 14 +++++--------- src/KnpUOAuth2ClientBundle.php | 5 ++--- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/DependencyInjection/KnpUOAuth2ClientExtension.php b/src/DependencyInjection/KnpUOAuth2ClientExtension.php index a7ad20ee..bec8aff4 100644 --- a/src/DependencyInjection/KnpUOAuth2ClientExtension.php +++ b/src/DependencyInjection/KnpUOAuth2ClientExtension.php @@ -165,7 +165,7 @@ public function __construct($checkExternalClassExistence = true) /** * Load the bundle configuration. */ - public function load(array $configs, ContainerBuilder $container) + public function load(array $configs, ContainerBuilder $container): void { $processor = new Processor(); $configuration = new Configuration(); @@ -246,7 +246,7 @@ public function load(array $configs, ContainerBuilder $container) * * @return string The client service id */ - private function configureProviderAndClient(ContainerBuilder $container, $providerType, $providerKey, $providerClass, $clientClass, $packageName, array $options, $redirectRoute, array $redirectParams, $useState, array $collaborators) + private function configureProviderAndClient(ContainerBuilder $container, $providerType, $providerKey, $providerClass, $clientClass, $packageName, array $options, $redirectRoute, array $redirectParams, $useState, array $collaborators): string { if ($this->checkExternalClassExistence && !class_exists($providerClass)) { if ('generic' === $providerType) { @@ -306,17 +306,15 @@ private function configureProviderAndClient(ContainerBuilder $container, $provid return $clientServiceKey; } - public static function getAllSupportedTypes() + public static function getAllSupportedTypes(): array { return array_keys(self::$supportedProviderTypes); } /** * @param string $type - * - * @return ProviderConfiguratorInterface */ - public function getConfigurator($type) + public function getConfigurator($type): ProviderConfiguratorInterface { if (!isset($this->configurators[$type])) { $class = self::$supportedProviderTypes[$type]; @@ -329,10 +327,8 @@ public function getConfigurator($type) /** * Overridden so the alias isn't "knp_uo_auth2_client". - * - * @return string */ - public function getAlias() + public function getAlias(): string { return 'knpu_oauth2_client'; } diff --git a/src/KnpUOAuth2ClientBundle.php b/src/KnpUOAuth2ClientBundle.php index 456db247..70549026 100644 --- a/src/KnpUOAuth2ClientBundle.php +++ b/src/KnpUOAuth2ClientBundle.php @@ -11,16 +11,15 @@ namespace KnpU\OAuth2ClientBundle; use KnpU\OAuth2ClientBundle\DependencyInjection\KnpUOAuth2ClientExtension; +use Symfony\Component\DependencyInjection\Extension\ExtensionInterface; use Symfony\Component\HttpKernel\Bundle\Bundle; class KnpUOAuth2ClientBundle extends Bundle { /** * Overridden to allow for the custom extension alias. - * - * @return KnpUOAuth2ClientExtension */ - public function getContainerExtension() + public function getContainerExtension(): ?ExtensionInterface { if (null === $this->extension) { return new KnpUOAuth2ClientExtension();