Skip to content

Commit

Permalink
feature #330 add symfony 6 return types (jrushlow)
Browse files Browse the repository at this point in the history
This PR was merged into the master branch.

Discussion
----------

add symfony 6 return types

Commits
-------

9c5286e add symfony 6 return types
  • Loading branch information
weaverryan committed Nov 19, 2021
2 parents acd2494 + 9c5286e commit 37d94d1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
14 changes: 5 additions & 9 deletions src/DependencyInjection/KnpUOAuth2ClientExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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];
Expand All @@ -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';
}
Expand Down
5 changes: 2 additions & 3 deletions src/KnpUOAuth2ClientBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 37d94d1

Please sign in to comment.