8000 minor #9871 [Yaml] fixed some license headers (fabpot) · symfony/symfony@ec9c6e0 · GitHub
[go: up one dir, main page]
Skip to content

Commit ec9c6e0

Browse files
fabpotfabpot
committed
minor #9871 [Yaml] fixed some license headers (fabpot)
This PR was merged into the 2.3 branch. Discussion ---------- [Yaml] fixed some license headers | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Fixes lambdas once and for all. Commits ------- a2a6bd4 fixed a typo 35b407f fixed CS for lambdas 93edf44 [Yaml] fixed some license headers
2 parents c9dd348 + a2a6bd4 commit ec9c6e0

File tree

47 files changed

+109
-106
lines changed

Some content is hidden

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

47 files changed

+109
-106
lines changed

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function process(ContainerBuilder $container)
5555

5656
$this->container = $container;
5757
$this->connections = $container->getParameter($this->connections);
58-
$sortFunc = function($a, $b) {
58+
$sortFunc = function ($a, $b) {
5959
$a = isset($a['priority']) ? $a['priority'] : 0;
6060
$b = isset($b['priority']) ? $b['priority'] : 0;
6161

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ public function testValidateUniquenessWithUnrewoundArray()
295295
$repository->expects($this->once())
296296
->method('findByCustom')
297297
->will(
298-
$this->returnCallback(function() use ($entity) {
298+
$this->returnCallback(function () use ($entity) {
299299
$returnValue = array(
300300
$entity,
301301
);

‎src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@ protected function outputServices(OutputInterface $output, $serviceIds, $showPri
207207
}
208208
}
209209
$format = '%-'.$maxName.'s ';
210-
$format .= implode("", array_map(function($length) { return "%-{$length}s "; }, $maxTags));
210+
$format .= implode("", array_map(function ($length) { return "%-{$length}s "; }, $maxTags));
211211
$format .= '%-'.$maxScope.'s %s';
212212

213213
// the title field needs extra space to make up for comment tags
214214
$format1 = '%-'.($maxName + 19).'s ';
215-
$format1 .= implode("", array_map(function($length) { return '%-'.($length + 19).'s '; }, $maxTags));
215+
$format1 .= implode("", array_map(function ($length) { return '%-'.($length + 19).'s '; }, $maxTags));
216216
$format1 .= '%-'.($maxScope + 19).'s %s';
217217

218218
$tags = array();
@@ -288,7 +288,7 @@ protected function outputService(OutputInterface $output, $serviceId)
288288
$output->writeln('<comment>Tags</comment>');
289289
foreach ($tags as $tagName => $tagData) {
290290
foreach ($tagData as $singleTagData) {
291-
$output->writeln(sprintf(' - %-30s (%s)', $tagName, implode(', ', array_map(function($key, $value) {
291+
$output->writeln(sprintf(' - %-30s (%s)', $tagName, implode(', ', array_map(function ($key, $value) {
292292
return sprintf('<info>%s</info>: %s', $key, $value);
293293
}, array_keys($singleTagData), array_values($singleTagData)))));
294294
}

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ public function getConfigTreeBuilder()
4141
->end()
4242
->arrayNode('trusted_proxies')
4343
->beforeNormalization()
44-
->ifTrue(function($v) { return !is_array($v) && !is_null($v); })
45-
->then(function($v) { return is_bool($v) ? array() : preg_split('/\s*,\s*/', $v); })
44+
->ifTrue(function ($v) { return !is_array($v) && !is_null($v); })
45+
->then(function ($v) { return is_bool($v) ? array() : preg_split('/\s*,\s*/', $v); })
4646
->end()
4747
->prototype('scalar')
4848
->validate()
49-
->ifTrue(function($v) {
49+
->ifTrue(function ($v) {
5050
if (empty($v)) {
5151
9828 return false;
5252
}
@@ -70,8 +70,8 @@ public function getConfigTreeBuilder()
7070
->scalarNode('default_locale')->defaultValue('en')->end()
7171
->arrayNode('trusted_hosts')
7272
->beforeNormalization()
73-
->ifTrue(function($v) { return is_string($v); })
74-
->then(function($v) { return array($v); })
73+
->ifTrue(function ($v) { return is_string($v); })
74+
->then(function ($v) { return array($v); })
7575
->end()
7676
->prototype('scalar')->end()
7777
->end()
@@ -226,7 +226,7 @@ private function addSessionSection(ArrayNodeDefinition $rootNode)
226226

227227
private function addTemplatingSection(ArrayNodeDefinition $rootNode)
228228
{
229-
$organizeUrls = function($urls) {
229+
$organizeUrls = function ($urls) {
230230
$urls += array(
231231
'http' => array(),
232232
'ssl' => array(),
@@ -263,8 +263,8 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
263263
->addDefaultChildrenIfNoneSet()
264264
->prototype('scalar')->defaultValue('FrameworkBundle:Form')->end()
265265
->validate()
266-
->ifTrue(function($v) {return !in_array('FrameworkBundle:Form', $v); })
267-
->then(function($v){
266+
->ifTrue(function ($v) {return !in_array('FrameworkBundle:Form', $v); })
267+
->then(function ($v) {
268268
return array_merge(array('FrameworkBundle:Form'), $v);
269269
})
270270
->end()
@@ -278,8 +278,8 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
278278
->performNoDeepMerging()
279279
->addDefaultsIfNotSet()
280280
->beforeNormalization()
281-
->ifTrue(function($v) { return !is_array($v); })
282-
->then(function($v) { return array($v); })
281+
->ifTrue(function ($v) { return !is_array($v); })
282+
->then(function ($v) { return array($v); })
283283
->end()
284284
->beforeNormalization()
285285
->always()
@@ -303,8 +303,8 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
303303
->isRequired()
304304
->requiresAtLeastOneElement()
305305
->beforeNormalization()
306-
->ifTrue(function($v){ return !is_array($v); })
307-
->then(function($v){ return array($v); })
306+
->ifTrue(function ($v) { return !is_array($v); })
307+
->then(function ($v) { return array($v); })
308308
->end()
309309
->prototype('scalar')->end()
310310
->end()
@@ -313,8 +313,8 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
313313
->children()
314314
->arrayNode('loaders')
315315
->beforeNormalization()
316-
->ifTrue(function($v){ return !is_array($v); })
317-
->then(function($v){ return array($v); })
316+
->ifTrue(function ($v) { return !is_array($v); })
317+
->then(function ($v) { return array($v); })
318318
->end()
319319
->prototype('scalar')->end()
320320
->end()
@@ -332,8 +332,8 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
332332
->performNoDeepMerging()
333333
->addDefaultsIfNotSet()
334334
->beforeNormalization()
335-
->ifTrue(function($v) { return !is_array($v); })
336-
->then(function($v) { return array($v); })
335+
->ifTrue(function ($v) { return !is_array($v); })
336+
->then(function ($v) { return array($v); })
337337
->end()
338338
->beforeNormalization()
339339
->always()

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
389389
// Apply request scope to assets helper if one or more packages are request-scoped
390390
$requireRequestScope = array_reduce(
391391
$namedPackages,
392-
function($v, Reference $ref) use ($container) {
392+
function ($v, Reference $ref) use ($container) {
393393
return $v || 'request' === $container->getDefinition($ref)->getScope();
394394
},
395395
'request' === $defaultPackage->getScope()
@@ -400,7 +400,7 @@ function($v, Reference $ref) use ($container) {
400400
}
401401

402402
if (!empty($config['loaders'])) {
403-
$loaders = array_map(function($loader) { return new Reference($loader); }, $config['loaders']);
403+
$loaders = array_map(function ($loader) { return new Reference($loader); }, $config['loaders']);
404404

405405
// Use a delegation unless only a single loader was registered
406406
if (1 === count($loaders)) {
@@ -437,7 +437,7 @@ function($v, Reference $ref) use ($container) {
437437
}
438438

439439
$container->setParameter('templating.engines', $config['engines']);
440-
$engines = array_map(function($engine) { return new Reference('templating.engine.'.$engine); }, $config['engines']);
440+
$engines = array_map(function ($engine) { return new Reference('templating.engine.'.$engine); }, $config['engines']);
441441

442442
// Use a delegation unless only a single engine was registered
443443
if (1 === count($engines)) {

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public function testTranslator()
181181
}
182182
}
183183

184-
$files = array_map(function($resource) { return realpath($resource[1]); }, $resources);
184+
$files = array_map(function ($resource) { return realpath($resource[1]); }, $resources);
185185
$ref = new \ReflectionClass('Symfony\Component\Validator\Validator');
186186
$this->assertContains(
187187
strtr(dirname($ref->getFileName()) . '/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),

‎src/Symfony/Bundle/SecurityBundle/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
}

‎src/Symfony/Bundle/SecurityBundle/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,18 +162,18 @@ 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
->end()
173173
->fixXmlConfig('role')
174174
->children()
175175
->arrayNode('roles')
176-
->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
176+
->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
177177
->prototype('scalar')->end()
178178
->end()
179179
->end()
@@ -223,8 +223,8 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
223223
->children()
224224
->arrayNode('delete_cookies')
225225
->beforeNormalization()
226-
->ifTrue(function($v) { return is_array($v) && is_int(key($v)); })
227-
->then(function($v) { return array_map(function($v) { return array('name' => $v); }, $v); })
226+
->ifTrue(function ($v) { return is_array($v) && is_int(key($v)); })
227+
->then(function ($v) { return array_map(function ($v) { return array('name' => $v); }, $v); })
228228
->end()
229229
->useAttributeAsKey('name')
230230
->prototype('array')
@@ -278,10 +278,10 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
278278
$firewallNodeBuilder
279279
->end()
280280
->validate()
281-
->ifTrue(function($v) {
281+
->ifTrue(function ($v) {
282282
return true === $v['security'] && isset($v['pattern']) && !isset($v['request_matcher']);
283283
})
284-
->then(function($firewall) use ($abstractFactoryKeys) {
284+
->then(function ($firewall) use ($abstractFactoryKeys) {
285285
foreach ($abstractFactoryKeys as $k) {
286286
if (!isset($firewall[$k]['check_path'])) {
287287
continue;
@@ -331,7 +331,7 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
331331
->arrayNode('providers')
332332
->beforeNormalization()
333333
->ifString()
334-
->then(function($v) { return preg_split('/\s*,\s*/', $v); })
334+
->then(function ($v) { return preg_split('/\s*,\s*/', $v); })
335335
->end()
336336
->prototype('scalar')->end()
337337
->end()
@@ -349,11 +349,11 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
349349

350350
$providerNodeBuilder
351351
->validate()
352-
->ifTrue(function($v){return count($v) > 1;})
352+
->ifTrue(function ($v) {return count($v) > 1;})
353353
->thenInvalid('You cannot set multiple provider types for the same provider')
354354
->end()
355355
->validate()
356-
->ifTrue(function($v){return count($v) === 0;})
356+
->ifTrue(function ($v) {return count($v) === 0;})
357357
->thenInvalid('You must set a provider definition for the provider.')
358358
->end()
359359
;
@@ -378,7 +378,7 @@ private function addEncodersSection(ArrayNodeDefinition $rootNode)
378378
->prototype('array')
379379
->canBeUnset()
380380
->performNoDeepMerging()
381-
->beforeNormalization()->ifString()->then(function($v) { return array('algorithm' => $v); })->end()
381+
->beforeNormalization()->ifString()->then(function ($v) { return array('algorithm' => $v); })->end()
382382
->children()
383383
->scalarNode('algorithm')->cannotBeEmpty()->end()
384384
->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()

‎src/Symfony/Bundle/SecurityBundle/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()

‎src/Symfony/Bundle/SecurityBundle/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()

0 commit comments

Comments
 (0)
0