Skip to content

Commit 0aa3043

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.4
* 2.3: fixed a typo fixed CS for lambdas [Yaml] fixed some license headers Fixes message value for objects Check for hour, minute & second validity fixed various typos [Filesystem] Fixed mirror for symlinks [Validator] Removed duplicated test for IBAN in data provider Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Component/Console/Application.php src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
2 parents c1541b2 + 9bc9813 commit 0aa3043

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

‎DataCollector/SecurityDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function collect(Request $request, Response $response, \Exception $except
5757
'authenticated' => $token->isAuthenticated(),
5858
'token_class' => get_class($token),
5959
'user' => $token->getUsername(),
60-
'roles' => array_map(function ($role){ return $role->getRole();}, $token->getRoles()),
60+
'roles' => array_map(function ($role) { return $role->getRole();}, $token->getRoles()),
6161
);
6262
}
6363
}

‎DependencyInjection/MainConfiguration.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ private function addRoleHierarchySection(ArrayNodeDefinition $rootNode)
132132
->useAttributeAsKey('id')
133133
->prototype('array')
134134
->performNoDeepMerging()
135-
->beforeNormalization()->ifString()->then(function($v) { return array('value' => $v); })->end()
135+
->beforeNormalization()->ifString()->then(function ($v) { return array('value' => $v); })->end()
136136
->beforeNormalization()
137-
->ifTrue(function($v) { return is_array($v) && isset($v['value']); })
138-
->then(function($v) { return preg_split('/\s*,\s*/', $v['value']); })
137+
->ifTrue(function ($v) { return is_array($v) && isset($v['value']); })
138+
->then(function ($v) { return preg_split('/\s*,\s*/', $v['value']); })
139139
->end()
140140
->prototype('scalar')->end()
141141
->end()
@@ -162,19 +162,19 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
162162
->end()
163163
->scalarNode('host')->defaultNull()->end()
164164
->arrayNode('ips')
165-
->beforeNormalization()->ifString()->then(function($v) { return array($v); })->end()
165+
->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
166166
->prototype('scalar')->end()
167167
->end()
168168
->arrayNode('methods')
169-
->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
169+
->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
170170
->prototype('scalar')->end()
171171
->end()
172172
->scalarNode('allow_if')->defaultNull()->end()
173173
->end()
174174
->fixXmlConfig('role')
175175
->children()
176176
->arrayNode('roles')
177-
->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
177+
->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
178178
->prototype('scalar')->end()
179179
->end()
180180
->end()
@@ -251,8 +251,8 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
251251
->children()
252252
->arrayNode('delete_cookies')
253253
->beforeNormalization()
254-
->ifTrue(function($v) { return is_array($v) && is_int(key($v)); })
255-
->then(function($v) { return array_map(function($v) { return array('name' => $v); }, $v); })
254+
->ifTrue(function ($v) { return is_array($v) && is_int(key($v)); })
255+
->then(function ($v) { return array_map(function ($v) { return array('name' => $v); }, $v); })
256256
->end()
257257
->useAttributeAsKey('name')
258258
->prototype('array')
@@ -306,10 +306,10 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
306306
$firewallNodeBuilder
307307
->end()
308308
->validate()
309-
->ifTrue(function($v) {
309+
->ifTrue(function ($v) {
310310
return true === $v['security'] && isset($v['pattern']) && !isset($v['request_matcher']);
311311
})
312-
->then(function($firewall) use ($abstractFactoryKeys) {
312+
->then(function ($firewall) use ($abstractFactoryKeys) {
313313
foreach ($abstractFactoryKeys as $k) {
314314
if (!isset($firewall[$k]['check_path'])) {
315315
continue;
@@ -359,7 +359,7 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
359359
->arrayNode('providers')
360360
->beforeNormalization()
361361
->ifString()
362-
->then(function($v) { return preg_split('/\s*,\s*/', $v); })
362+
->then(function ($v) { return preg_split('/\s*,\s*/', $v); })
363363
->end()
364364
->prototype('scalar')->end()
365365
->end()
@@ -377,11 +377,11 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
377377

378378
$providerNodeBuilder
379379
->validate()
380-
->ifTrue(function($v){return count($v) > 1;})
380+
->ifTrue(function ($v) {return count($v) > 1;})
381381
->thenInvalid('You cannot set multiple provider types for the same provider')
382382
->end()
383383
->validate()
384-
->ifTrue(function($v){return count($v) === 0;})
384+
->ifTrue(function ($v) {return count($v) === 0;})
385385
->thenInvalid('You must set a provider definition for the provider.')
386386
->end()
387387
;
@@ -406,7 +406,7 @@ private function addEncodersSection(ArrayNodeDefinition $rootNode)
406406
->prototype('array')
407407
->canBeUnset()
408408
->performNoDeepMerging()
409-
->beforeNormalization()->ifString()->then(function($v) { return array('algorithm' => $v); })->end()
409+
->beforeNormalization()->ifString()->then(function ($v) { return array('algorithm' => $v); })->end()
410410
->children()
411411
->scalarNode('algorithm')->cannotBeEmpty()->end()
412412
->scalarNode('hash_algorithm')->info('Name of hashing algorithm for PBKDF2 (i.e. sha256, sha512, etc..) See hash_algos() for a list of supported algorithms.')->defaultValue('sha512')->end()

‎DependencyInjection/Security/Factory/RememberMeFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public function addConfiguration(NodeDefinition $node)
126126
->scalarNode('token_provider')->end()
127127
->arrayNode('user_providers')
128128
->beforeNormalization()
129-
->ifString()->then(function($v) { return array($v); })
129+
->ifString()->then(function ($v) { return array($v); })
130130
->end()
131131
->prototype('scalar')->end()
132132
->end()

‎DependencyInjection/Security/UserProvider/InMemoryFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function addConfiguration(NodeDefinition $node)
5757
->children()
5858
->scalarNode('password')->defaultValue(uniqid())->end()
5959
->arrayNode('roles')
60-
->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
60+
->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
6161
->prototype('scalar')->end()
6262
->end()
6363
->end()

‎DependencyInjection/SecurityExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ private function createFirewalls($config, ContainerBuilder $container)
236236
$mapDef->replaceArgument(1, $map);
237237

238238
// add authentication providers to authentication manager
239-
$authenticationProviders = array_map(function($id) {
239+
$authenticationProviders = array_map(function ($id) {
240240
return new Reference($id);
241241
}, array_values(array_unique($authenticationProviders)));
242242
$container

0 commit comments

Comments
 (0)