Skip to content

Commit d830f4c

Browse files
derrabusnicolas-grekas
derrabus
authored and
nicolas-grekas
committed
Add missing return types to interfaces
1 parent 6960437 commit d830f4c

File tree

11 files changed

+44
-23
lines changed

11 files changed

+44
-23
lines changed

‎DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ public function getPriority(): int;
3030
*/
3131
public function getKey(): string;
3232

33+
/**
34+
* @return void
35+
*/
3336
public function addConfiguration(NodeDefinition $builder);
3437

3538
/**

‎DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,18 @@
2222
*/
2323
interface UserProviderFactoryInterface
2424
{
25+
/**
26+
* @return void
27+
*/
2528
public function create(ContainerBuilder $container, string $id, array $config);
2629

30+
/**
31+
* @return string
32+
*/
2733
public function getKey();
2834

35+
/**
36+
* @return void
37+
*/
2938
public function addConfiguration(NodeDefinition $builder);
3039
}

‎DependencyInjection/SecurityExtension.php‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
7878
private array $sortedFactories = [];
7979
private array $userProviderFactories = [];
8080

81+
/**
82+
* @return void
83+
*/
8184
public function prepend(ContainerBuilder $container)
8285
{
8386
foreach ($this->getSortedFactories() as $factory) {
@@ -87,6 +90,9 @@ public function prepend(ContainerBuilder $container)
8790
}
8891
}
8992

93+
/**
94+
* @return void
95+
*/
9096
public function load(array $configs, ContainerBuilder $container)
9197
{
9298
if (!array_filter($configs)) {
@@ -200,7 +206,7 @@ private function createStrategyDefinition(string $strategy, bool $allowIfAllAbst
200206
};
201207
}
202208

203-
private function createRoleHierarchy(array $config, ContainerBuilder $container)
209+
private function createRoleHierarchy(array $config, ContainerBuilder $container): void
204210
{
205211
if (!isset($config['role_hierarchy']) || 0 === \count($config['role_hierarchy'])) {
206212
$container->removeDefinition('security.access.role_hierarchy_voter');
@@ -212,7 +218,7 @@ private function createRoleHierarchy(array $config, ContainerBuilder $container)
212218
$container->removeDefinition('security.access.simple_role_voter');
213219
}
214220

215-
private function createAuthorization(array $config, ContainerBuilder $container)
221+
private function createAuthorization(array $config, ContainerBuilder $container): void
216222
{
217223
foreach ($config['access_control'] as $access) {
218224
if (isset($access['request_matcher'])) {
@@ -265,7 +271,7 @@ private function createAuthorization(array $config, ContainerBuilder $container)
265271
}
266272
}
267273

268-
private function createFirewalls(array $config, ContainerBuilder $container)
274+
private function createFirewalls(array $config, ContainerBuilder $container): void
269275
{
270276
if (!isset($config['firewalls'])) {
271277
return;
@@ -692,7 +698,7 @@ private function createMissingUserProvider(ContainerBuilder $container, string $
692698
return $userProvider;
693699
}
694700

695-
private function createHashers(array $hashers, ContainerBuilder $container)
701+
private function createHashers(array $hashers, ContainerBuilder $container): void
696702
{
697703
$hasherMap = [];
698704
foreach ($hashers as $class => $hasher) {
@@ -705,7 +711,12 @@ private function createHashers(array $hashers, ContainerBuilder $container)
705711
;
706712
}
707713

708-
private function createHasher(array $config)
714+
/**
715+
* @param array<string, mixed> $config
716+
*
717+
* @return Reference|array<string, mixed>
718+
*/
719+
private function createHasher(array $config): Reference|array
709720
{
710721
// a custom hasher service
711722
if (isset($config['id'])) {
@@ -996,13 +1007,13 @@ private function createRequestMatcher(ContainerBuilder $container, string $path
9961007
return $this->requestMatchers[$id] = new Reference($id);
9971008
}
9981009

999-
public function addAuthenticatorFactory(AuthenticatorFactoryInterface $factory)
1010+
public function addAuthenticatorFactory(AuthenticatorFactoryInterface $factory): void
10001011
{
10011012
$this->factories[] = [$factory->getPriority(), $factory];
10021013
$this->sortedFactories = [];
10031014
}
10041015

1005-
public function addUserProviderFactory(UserProviderFactoryInterface $factory)
1016+
public function addUserProviderFactory(UserProviderFactoryInterface $factory): void
10061017
{
10071018
$this->userProviderFactories[] = $factory;
10081019
}

‎Tests/DependencyInjection/Fixtures/UserProvider/DummyProvider.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
class DummyProvider implements UserProviderFactoryInterface
1010
{
11-
public function create(ContainerBuilder $container, $id, $config)
11+
public function create(ContainerBuilder $container, $id, $config): void
1212
{
1313
}
1414

15-
public function getKey()
15+
public function getKey(): string
1616
{
1717
return 'foo';
1818
}
1919

20-
public function addConfiguration(NodeDefinition $node)
20+
public function addConfiguration(NodeDefinition $node): void
2121
{
2222
}
2323
}

‎Tests/DependencyInjection/SecurityExtensionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ public function getKey(): string
956956
return 'custom_listener';
957957
}
958958

959-
public function addConfiguration(NodeDefinition $builder)
959+
public function addConfiguration(NodeDefinition $builder): void
960960
{
961961
}
962962
}

‎Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class AuthenticatorBundle extends Bundle
1919
{
20-
public function build(ContainerBuilder $container)
20+
public function build(ContainerBuilder $container): void
2121
{
2222
parent::build($container);
2323

‎Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@
3232
*/
3333
class UserLoginType extends AbstractType
3434
{
35-
private $requestStack;
36-
37-
public function __construct(RequestStack $requestStack)
38-
{
39-
$this->requestStack = $requestStack;
35+
public function __construct(
36+
private readonly RequestStack $requestStack,
37+
) {
4038
}
4139

42-
public function buildForm(FormBuilderInterface $builder, array $options)
40+
public function buildForm(FormBuilderInterface $builder, array $options): void
4341
{
4442
$builder
4543
->add('username', TextType::class)
@@ -71,7 +69,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
7169
});
7270
}
7371

74-
public function configureOptions(OptionsResolver $resolver)
72+
public function configureOptions(OptionsResolver $resolver): void
7573
{
7674
/* Note: the form's csrf_token_id must correspond to that for the form login
7775
* listener in order for the CSRF token to validate successfully.

‎Tests/Functional/Bundle/FirewallEntryPointBundle/DependencyInjection/FirewallEntryPointExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
class FirewallEntryPointExtension extends Extension
2020
{
21-
public function load(array $configs, ContainerBuilder $container)
21+
public function load(array $configs, ContainerBuilder $container): void
2222
{
2323
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
2424
$loader->load('services.xml');

‎Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
class FormLoginExtension extends Extension
2020
{
21-
public function load(array $configs, ContainerBuilder $container)
21+
public function load(array $configs, ContainerBuilder $container): void
2222
{
2323
$container
2424
->register('localized_form_failure_handler', LocalizedFormFailureHandler::class)

‎Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
class FormLoginBundle extends Bundle
2020
{
21-
public function build(ContainerBuilder $container)
21+
public function build(ContainerBuilder $container): void
2222
{
2323
parent::build($container);
2424

0 commit comments

Comments
 (0)