Skip to content

Commit 4ec4750

Browse files
fabpotfabpot
committed
Merge branch '3.4' into 4.1
* 3.4: fixed CS fixed short array CS in comments fixed CS in ExpressionLanguage fixtures fixed CS in generated files fixed CS on generated container files fixed CS on Form PHP templates fixed CS on YAML fixtures fixed fixtures switched array() to []
2 parents d896014 + dcd6b69 commit 4ec4750

File tree

55 files changed

+340
-340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+340
-340
lines changed

‎Debug/WrappedListener.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function handle(GetResponseEvent $event)
5353
*/
5454
public function __call($method, $arguments)
5555
{
56-
return \call_user_func_array(array($this->listener, $method), $arguments);
56+
return \call_user_func_array([$this->listener, $method], $arguments);
5757
}
5858

5959
public function getWrappedListener(): ListenerInterface
@@ -67,10 +67,10 @@ public function getInfo(): array
6767
$this->stub = self::$hasVarDumper ? new ClassStub(\get_class($this->listener)) : \get_class($this->listener);
6868
}
6969

70-
return array(
70+
return [
7171
'response' => $this->response,
7272
'time' => $this->time,
7373
'stub' => $this->stub,
74-
);
74+
];
7575
}
7676
}

‎DependencyInjection/Compiler/RegisterCsrfTokenClearingLogoutHandlerPass.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ public function process(ContainerBuilder $container)
3737
->addArgument(new Reference('security.csrf.token_storage'))
3838
->setPublic(false);
3939

40-
$container->findDefinition('security.logout_listener')->addMethodCall('addHandler', array(new Reference('security.logout.handler.csrf_token_clearing')));
40+
$container->findDefinition('security.logout_listener')->addMethodCall('addHandler', [new Reference('security.logout.handler.csrf_token_clearing')]);
4141
}
4242
}

‎DependencyInjection/Security/Factory/AbstractFactory.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,26 @@
2626
*/
2727
abstract class AbstractFactory implements SecurityFactoryInterface
2828
{
29-
protected $options = array(
29+
protected $options = [
3030
'check_path' => '/login_check',
3131
'use_forward' => false,
3232
'require_previous_session' => false,
33-
);
33+
];
3434

35-
protected $defaultSuccessHandlerOptions = array(
35+
protected $defaultSuccessHandlerOptions = [
3636
'always_use_default_target_path' => false,
3737
'default_target_path' => '/',
3838
'login_path' => '/login',
3939
'target_path_parameter' => '_target_path',
4040
'use_referer' => false,
41-
);
41+
];
4242

43-
protected $defaultFailureHandlerOptions = array(
43+
protected $defaultFailureHandlerOptions = [
4444
'failure_path' => null,
4545
'failure_forward' => false,
4646
'login_path' => '/login',
4747
'failure_path_parameter' => '_failure_path',
48-
);
48+
];
4949

5050
public function create(ContainerBuilder $container, $id, $config, $userProviderId, $defaultEntryPointId)
5151
{
@@ -59,14 +59,14 @@ public function create(ContainerBuilder $container, $id, $config, $userProviderI
5959
if ($this->isRememberMeAware($config)) {
6060
$container
6161
->getDefinition($listenerId)
62-
->addTag('security.remember_me_aware', array('id' => $id, 'provider' => $userProviderId))
62+
->addTag('security.remember_me_aware', ['id' => $id, 'provider' => $userProviderId])
6363
;
6464
}
6565

6666
// create entry point if applicable (optional)
6767
$entryPointId = $this->createEntryPoint($container, $id, $config, $defaultEntryPointId);
6868

69-
return array($authProviderId, $listenerId, $entryPointId);
69+
return [$authProviderId, $listenerId, $entryPointId];
7070
}
7171

7272
public function addConfiguration(NodeDefinition $node)
@@ -178,8 +178,8 @@ protected function createAuthenticationSuccessHandler($container, $id, $config)
178178
$successHandler->replaceArgument(2, $id);
179179
} else {
180180
$successHandler = $container->setDefinition($successHandlerId, new ChildDefinition('security.authentication.success_handler'));
181-
$successHandler->addMethodCall('setOptions', array($options));
182-
$successHandler->addMethodCall('setProviderKey', array($id));
181+
$successHandler->addMethodCall('setOptions', [$options]);
182+
$successHandler->addMethodCall('setProviderKey', [$id]);
183183
}
184184

185185
return $successHandlerId;
@@ -196,7 +196,7 @@ protected function createAuthenticationFailureHandler($container, $id, $config)
196196
$failureHandler->replaceArgument(1, $options);
197197
} else {
198198
$failureHandler = $container->setDefinition($id, new ChildDefinition('security.authentication.failure_handler'));
199-
$failureHandler->addMethodCall('setOptions', array($options));
199+
$failureHandler->addMethodCall('setOptions', [$options]);
200200
}
201201

202202
return $id;

‎DependencyInjection/Security/Factory/FormLoginLdapFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
3737
;
3838

3939
if (!empty($config['query_string'])) {
40-
$definition->addMethodCall('setQueryString', array($config['query_string']));
40+
$definition->addMethodCall('setQueryString', [$config['query_string']]);
4141
}
4242

4343
return $provider;

‎DependencyInjection/Security/Factory/GuardAuthenticationFactory.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function addConfiguration(NodeDefinition $node)
5858
public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
5959
{
6060
$authenticatorIds = $config['authenticators'];
61-
$authenticatorReferences = array();
61+
$authenticatorReferences = [];
6262
foreach ($authenticatorIds as $authenticatorId) {
6363
$authenticatorReferences[] = new Reference($authenticatorId);
6464
}
@@ -87,9 +87,9 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
8787
// this is always injected - then the listener decides if it should be used
8888
$container
8989
->getDefinition($listenerId)
90-
->addTag('security.remember_me_aware', array('id' => $id, 'provider' => $userProvider));
90+
->addTag('security.remember_me_aware', ['id' => $id, 'provider' => $userProvider]);
9191

92-
return array($providerId, $listenerId, $entryPointId);
92+
return [$providerId, $listenerId, $entryPointId];
9393
}
9494

9595
private function determineEntryPoint($defaultEntryPointId, array $config)

‎DependencyInjection/Security/Factory/HttpBasicFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
4141
$listener = $container->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.basic'));
4242
$listener->replaceArgument(2, $id);
4343
$listener->replaceArgument(3, new Reference($entryPointId));
44-
$listener->addMethodCall('setSessionAuthenticationStrategy', array(new Reference('security.authentication.session_strategy.'.$id)));
44+
$listener->addMethodCall('setSessionAuthenticationStrategy', [new Reference('security.authentication.session_strategy.'.$id)]);
4545

46-
return array($provider, $listenerId, $entryPointId);
46+
return [$provider, $listenerId, $entryPointId];
4747
}
4848

4949
public function getPosition()

‎DependencyInjection/Security/Factory/HttpBasicLdapFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
4141
$entryPointId = $this->createEntryPoint($container, $id, $config, $defaultEntryPoint);
4242

4343
if (!empty($config['query_string'])) {
44-
$definition->addMethodCall('setQueryString', array($config['query_string']));
44+
$definition->addMethodCall('setQueryString', [$config['query_string']]);
4545
}
4646

4747
// listener
@@ -50,7 +50,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
5050
$listener->replaceArgument(2, $id);
5151
$listener->replaceArgument(3, new Reference($entryPointId));
5252

53-
return array($provider, $listenerId, $entryPointId);
53+
return [$provider, $listenerId, $entryPointId];
5454
}
5555

5656
public function addConfiguration(NodeDefinition $node)

‎DependencyInjection/Security/Factory/JsonLoginFactory.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public function __construct()
2626
{
2727
$this->addOption('username_path', 'username');
2828
$this->addOption('password_path', 'password');
29-
$this->defaultFailureHandlerOptions = array();
30-
$this->defaultSuccessHandlerOptions = array();
29+
$this->defaultFailureHandlerOptions = [];
30+
$this->defaultSuccessHandlerOptions = [];
3131
}
3232

3333
/**
@@ -89,7 +89,7 @@ protected function createListener($container, $id, $config, $userProvider)
8989
$listener->replaceArgument(4, isset($config['success_handler']) ? new Reference($this->createAuthenticationSuccessHandler($container, $id, $config)) : null);
9090
$listener->replaceArgument(5, isset($config['failure_handler']) ? new Reference($this->createAuthenticationFailureHandler($container, $id, $config)) : null);
9191
$listener->replaceArgument(6, array_intersect_key($config, $this->options));
92-
$listener->addMethodCall('setSessionAuthenticationStrategy', array(new Reference('security.authentication.session_strategy.'.$id)));
92+
$listener->addMethodCall('setSessionAuthenticationStrategy', [new Reference('security.authentication.session_strategy.'.$id)]);
9393

9494
$listenerId .= '.'.$id;
9595
$container->setDefinition($listenerId, $listener);

‎DependencyInjection/Security/Factory/RememberMeFactory.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
class RememberMeFactory implements SecurityFactoryInterface
2020
{
21-
protected $options = array(
21+
protected $options = [
2222
'name' => 'REMEMBERME',
2323
'lifetime' => 31536000,
2424
'path' => '/',
@@ -27,7 +27,7 @@ class RememberMeFactory implements SecurityFactoryInterface
2727
'httponly' => true,
2828
'always_remember_me' => false,
2929
'remember_me_parameter' => '_remember_me',
30-
);
30+
];
3131

3232
public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
3333
{
@@ -52,7 +52,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
5252
if ($container->hasDefinition('security.logout_listener.'.$id)) {
5353
$container
5454
->getDefinition('security.logout_listener.'.$id)
55-
->addMethodCall('addHandler', array(new Reference($rememberMeServicesId)))
55+
->addMethodCall('addHandler', [new Reference($rememberMeServicesId)])
5656
;
5757
}
5858

@@ -61,16 +61,16 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
6161
$rememberMeServices->replaceArgument(2, $id);
6262

6363
if (isset($config['token_provider'])) {
64-
$rememberMeServices->addMethodCall('setTokenProvider', array(
64+
$rememberMeServices->addMethodCall('setTokenProvider', [
6565
new Reference($config['token_provider']),
66-
));
66+
]);
6767
}
6868

6969
// remember-me options
7070
$rememberMeServices->replaceArgument(3, array_intersect_key($config, $this->options));
7171

7272
// attach to remember-me aware listeners
73-
$userProviders = array();
73+
$userProviders = [];
7474
foreach ($container->findTaggedServiceIds('security.remember_me_aware') as $serviceId => $attributes) {
7575
foreach ($attributes as $attribute) {
7676
if (!isset($attribute['id']) || $attribute['id'] !== $id) {
@@ -84,12 +84,12 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
8484
$userProviders[] = new Reference($attribute['provider']);
8585
$container
8686
->getDefinition($serviceId)
87-
->addMethodCall('setRememberMeServices', array(new Reference($rememberMeServicesId)))
87+
->addMethodCall('setRememberMeServices', [new Reference($rememberMeServicesId)])
8888
;
8989
}
9090
}
9191
if ($config['user_providers']) {
92-
$userProviders = array();
92+
$userProviders = [];
9393
foreach ($config['user_providers'] as $providerName) {
9494
$userProviders[] = new Reference('security.user.provider.concrete.'.$providerName);
9595
}
@@ -106,7 +106,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
106106
$listener->replaceArgument(1, new Reference($rememberMeServicesId));
107107
$listener->replaceArgument(5, $config['catch_exceptions']);
108108

109-
return array($authProviderId, $listenerId, $defaultEntryPoint);
109+
return [$authProviderId, $listenerId, $defaultEntryPoint];
110110
}
111111

112112
public function getPosition()
@@ -131,7 +131,7 @@ public function addConfiguration(NodeDefinition $node)
131131
->scalarNode('token_provider')->end()
132132
->arrayNode('user_providers')
133133
->beforeNormalization()
134-
->ifString()->then(function ($v) { return array($v); })
134+
->ifString()->then(function ($v) { return [$v]; })
135135
->end()
136136
->prototype('scalar')->end()
137137
->end()

‎DependencyInjection/Security/Factory/RemoteUserFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
3838
$listener = $container->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.remote_user'));
3939
$listener->replaceArgument(2, $id);
4040
$listener->replaceArgument(3, $config['user']);
41-
$listener->addMethodCall('setSessionAuthenticationStrategy', array(new Reference('security.authentication.session_strategy.'.$id)));
41+
$listener->addMethodCall('setSessionAuthenticationStrategy', [new Reference('security.authentication.session_strategy.'.$id)]);
4242

43-
return array($providerId, $listenerId, $defaultEntryPoint);
43+
return [$providerId, $listenerId, $defaultEntryPoint];
4444
}
4545

4646
public function getPosition()

0 commit comments

Comments
 (0)