Skip to content

Commit d678a5b

Browse files
fabpotfabpot
committed
fixed CS
1 parent b030f98 commit d678a5b

35 files changed

+409
-409
lines changed

‎Compiler/AbstractRecursivePass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected function processValue($value, $isRoot = false)
8686
} elseif ($value instanceof ArgumentInterface) {
8787
$value->setValues($this->processValue($value->getValues()));
8888
} elseif ($value instanceof Expression && $this->processExpressions) {
89-
$this->getExpressionLanguage()->compile((string) $value, array('this' => 'container'));
89+
$this->getExpressionLanguage()->compile((string) $value, ['this' => 'container']);
9090
} elseif ($value instanceof Definition) {
9191
$value->setArguments($this->processValue($value->getArguments()));
9292
$value->setProperties($this->processValue($value->getProperties()));

‎Compiler/AnalyzeServiceReferencesPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function process(ContainerBuilder $container)
7878
try {
7979
parent::process($container);
8080
} finally {
81-
$this->aliases = $this->definitions = array();
81+
$this->aliases = $this->definitions = [];
8282
}
8383
}
8484

‎Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
*/
2424
class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass
2525
{
26-
private $serviceLocatorContextIds = array();
26+
private $serviceLocatorContextIds = [];
2727

2828
/**
2929
* {@inheritdoc}
3030
*/
3131
public function process(ContainerBuilder $container)
3232
{
33-
$this->serviceLocatorContextIds = array();
33+
$this->serviceLocatorContextIds = [];
3434
foreach ($container->findTaggedServiceIds('container.service_locator_context') as $id => $tags) {
3535
$this->serviceLocatorContextIds[$id] = $tags[0]['id'];
3636
$container->getDefinition($id)->clearTag('container.service_locator_context');
@@ -39,7 +39,7 @@ public function process(ContainerBuilder $container)
3939
try {
4040
return parent::process($container);
4141
} finally {
42-
$this->serviceLocatorContextIds = array();
42+
$this->serviceLocatorContextIds = [];
4343
}
4444
}
4545

‎Compiler/InlineServiceDefinitionsPass.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe
2626
{
2727
private $analyzingPass;
2828
private $repeatedPass;
29-
private $cloningIds = array();
30-
private $connectedIds = array();
31-
private $notInlinedIds = array();
32-
private $inlinedIds = array();
29+
private $cloningIds = [];
30+
private $connectedIds = [];
31+
private $notInlinedIds = [];
32+
private $inlinedIds = [];
3333
private $graph;
3434

3535
public function __construct(AnalyzeServiceReferencesPass $analyzingPass = null)
@@ -68,7 +68,7 @@ public function process(ContainerBuilder $container)
6868
}
6969
$this->graph = $analyzedContainer->getCompiler()->getServiceReferenceGraph();
7070
$notInlinedIds = $this->notInlinedIds;
71-
$this->connectedIds = $this->notInlinedIds = $this->inlinedIds = array();
71+
$this->connectedIds = $this->notInlinedIds = $this->inlinedIds = [];
7272

7373
foreach ($analyzedContainer->getDefinitions() as $id => $definition) {
7474
if (!$this->graph->hasNode($id)) {
@@ -96,7 +96,7 @@ public function process(ContainerBuilder $container)
9696
}
9797
} finally {
9898
$this->container = null;
99-
$this->connectedIds = $this->notInlinedIds = $this->inlinedIds = array();
99+
$this->connectedIds = $this->notInlinedIds = $this->inlinedIds = [];
100100
$this->graph = null;
101101
}
102102
}
@@ -193,7 +193,7 @@ private function isInlineableDefinition($id, Definition $definition)
193193
}
194194
$this->connectedIds[$id] = true;
195195

196-
$srcIds = array();
196+
$srcIds = [];
197197
$srcCount = 0;
198198
$isReferencedByConstructor = false;
199199
foreach ($this->graph->getNode($id)->getInEdges() as $edge) {

‎Compiler/PassConfig.php

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@ class PassConfig
2929
const TYPE_REMOVE = 'removing';
3030

3131
private $mergePass;
32-
private $afterRemovingPasses = array();
33-
private $beforeOptimizationPasses = array();
34-
private $beforeRemovingPasses = array();
32+
private $afterRemovingPasses = [];
33+
private $beforeOptimizationPasses = [];
34+
private $beforeRemovingPasses = [];
3535
private $optimizationPasses;
3636
private $removingPasses;
3737

3838
public function __construct()
3939
{
4040
$this->mergePass = new MergeExtensionConfigurationPass();
4141

42-
$this->beforeOptimizationPasses = array(
43-
100 => array(
42+
$this->beforeOptimizationPasses = [
43+
100 => [
4444
new ResolveClassPass(),
4545
new ResolveInstanceofConditionalsPass(),
4646
new RegisterEnvVarProcessorsPass(),
47-
),
48-
-1000 => array(new ExtensionCompilerPass()),
49-
);
47+
],
48+
-1000 => [new ExtensionCompilerPass()],
49+
];
5050

51-
$this->optimizationPasses = array(array(
51+
$this->optimizationPasses = [[
5252
new ValidateEnvPlaceholdersPass(),
5353
new ResolveChildDefinitionsPass(),
5454
new ServiceLocatorTagPass(),
@@ -69,15 +69,15 @@ public function __construct()
6969
new CheckCircularReferencesPass(),
7070
new CheckReferenceValidityPass(),
7171
new CheckArgumentsValidityPass(false),
72-
));
72+
]];
7373

74-
$this->beforeRemovingPasses = array(
75-
-100 => array(
74+
$this->beforeRemovingPasses = [
75+
-100 => [
7676
new ResolvePrivatesPass(),
77-
),
78-
);
77+
],
78+
];
7979

80-
$this->removingPasses = array(array(
80+
$this->removingPasses = [[
8181
new RemovePrivateAliasesPass(),
8282
new ReplaceAliasByActualDefinitionPass(),
8383
new RemoveAbstractDefinitionsPass(),
@@ -87,7 +87,7 @@ public function __construct()
8787
new DefinitionErrorExceptionPass(),
8888
new CheckExceptionOnInvalidReferenceBehaviorPass(),
8989
new ResolveHotPathPass(),
90-
));
90+
]];
9191
}
9292

9393
/**
@@ -98,7 +98,7 @@ public function __construct()
9898
public function getPasses()
9999
{
100100
return array_merge(
101-
array($this->mergePass),
101+
[$this->mergePass],
102102
$this->getBeforeOptimizationPasses(),
103103
$this->getOptimizationPasses(),
104104
$this->getBeforeRemovingPasses(),
@@ -126,7 +126,7 @@ public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_O
126126
$passes = &$this->$property;
127127

128128
if (!isset($passes[$priority])) {
129-
$passes[$priority] = array();
129+
$passes[$priority] = [];
130130
}
131131
$passes[$priority][] = $pass;
132132
}
@@ -203,7 +203,7 @@ public function setMergePass(CompilerPassInterface $pass)
203203
*/
204204
public function setAfterRemovingPasses(array $passes)
205205
{
206-
$this->afterRemovingPasses = array($passes);
206+
$this->afterRemovingPasses = [$passes];
207207
}
208208

209209
/**
@@ -213,7 +213,7 @@ public function setAfterRemovingPasses(array $passes)
213213
*/
214214
public function setBeforeOptimizationPasses(array $passes)
215215
{
216-
$this->beforeOptimizationPasses = array($passes);
216+
$this->beforeOptimizationPasses = [$passes];
217217
}
218218

219219
/**
@@ -223,7 +223,7 @@ public function setBeforeOptimizationPasses(array $passes)
223223
*/
224224
public function setBeforeRemovingPasses(array $passes)
225225
{
226-
$this->beforeRemovingPasses = array($passes);
226+
$this->beforeRemovingPasses = [$passes];
227227
}
228228

229229
/**
@@ -233,7 +233,7 @@ public function setBeforeRemovingPasses(array $passes)
233233
*/
234234
public function setOptimizationPasses(array $passes)
235235
{
236-
$this->optimizationPasses = array($passes);
236+
$this->optimizationPasses = [$passes];
237237
}
238238

239239
/**
@@ -243,7 +243,7 @@ public function setOptimizationPasses(array $passes)
243243
*/
244244
public function setRemovingPasses(array $passes)
245245
{
246-
$this->removingPasses = array($passes);
246+
$this->removingPasses = [$passes];
247247
}
248248

249249
/**
@@ -256,7 +256,7 @@ public function setRemovingPasses(array $passes)
256256
private function sortPasses(array $passes)
257257
{
258258
if (0 === \count($passes)) {
259-
return array();
259+
return [];
260260
}
261261

262262
krsort($passes);

‎Compiler/RegisterEnvVarProcessorsPass.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
*/
2626
class RegisterEnvVarProcessorsPass implements CompilerPassInterface
2727
{
28-
private static $allowedTypes = array('array', 'bool', 'float', 'int', 'string');
28+
private static $allowedTypes = ['array', 'bool', 'float', 'int', 'string'];
2929

3030
public function process(ContainerBuilder $container)
3131
{
3232
$bag = $container->getParameterBag();
33-
$types = array();
34-
$processors = array();
33+
$types = [];
34+
$processors = [];
3535
foreach ($container->findTaggedServiceIds('container.env_var_processor') as $id => $tags) {
3636
if (!$r = $container->getReflectionClass($class = $container->getDefinition($id)->getClass())) {
3737
throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));

‎Compiler/RemoveUnusedDefinitionsPass.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
class RemoveUnusedDefinitionsPass extends AbstractRecursivePass implements RepeatablePassInterface
2424
{
25-
private $connectedIds = array();
25+
private $connectedIds = [];
2626

2727
/**
2828
* {@inheritdoc}
@@ -40,7 +40,7 @@ public function process(ContainerBuilder $container)
4040
try {
4141
$this->enableExpressionProcessing();
4242
$this->container = $container;
43-
$connectedIds = array();
43+
$connectedIds = [];
4444
$aliases = $container->getAliases();
4545

4646
foreach ($aliases as $id => $alias) {
@@ -58,7 +58,7 @@ public function process(ContainerBuilder $container)
5858

5959
while ($this->connectedIds) {
6060
$ids = $this->connectedIds;
61-
$this->connectedIds = array();
61+
$this->connectedIds = [];
6262
foreach ($ids as $id) {
6363
if (!isset($connectedIds[$id]) && $container->hasDefinition($id)) {
6464
$connectedIds[$id] = true;
@@ -76,7 +76,7 @@ public function process(ContainerBuilder $container)
7676
}
7777
} finally {
7878
$this->container = null;
79-
$this->connectedIds = array();
79+
$this->connectedIds = [];
8080
}
8181
}
8282

‎Compiler/ReplaceAliasByActualDefinitionPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function process(ContainerBuilder $container)
5656
$definition = $container->getDefinition($targetId);
5757
} catch (ServiceNotFoundException $e) {
5858
if ('' !== $e->getId() && '@' === $e->getId()[0]) {
59-
throw new ServiceNotFoundException($e->getId(), $e->getSourceId(), null, array(substr($e->getId(), 1)));
59+
throw new ServiceNotFoundException($e->getId(), $e->getSourceId(), null, [substr($e->getId(), 1)]);
6060
}
6161

6262
throw $e;

‎Compiler/ResolveInstanceofConditionalsPass.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function process(ContainerBuilder $container)
4747
private function processDefinition(ContainerBuilder $container, $id, Definition $definition)
4848
{
4949
$instanceofConditionals = $definition->getInstanceofConditionals();
50-
$autoconfiguredInstanceof = $definition->isAutoconfigured() ? $container->getAutoconfiguredInstanceof() : array();
50+
$autoconfiguredInstanceof = $definition->isAutoconfigured() ? $container->getAutoconfiguredInstanceof() : [];
5151
if (!$instanceofConditionals && !$autoconfiguredInstanceof) {
5252
return $definition;
5353
}
@@ -58,11 +58,11 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
5858

5959
$conditionals = $this->mergeConditionals($autoconfiguredInstanceof, $instanceofConditionals, $container);
6060

61-
$definition->setInstanceofConditionals(array());
61+
$definition->setInstanceofConditionals([]);
6262
$parent = $shared = null;
63-
$instanceofTags = array();
64-
$instanceofCalls = array();
65-
$instanceofBindings = array();
63+
$instanceofTags = [];
64+
$instanceofCalls = [];
65+
$instanceofBindings = [];
6666

6767
foreach ($conditionals as $interface => $instanceofDefs) {
6868
if ($interface !== $class && (!$container->getReflectionClass($class, false))) {
@@ -86,9 +86,9 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
8686
$instanceofCalls[] = $methodCall;
8787
}
8888

89-
$instanceofDef->setTags(array());
90-
$instanceofDef->setMethodCalls(array());
91-
$instanceofDef->setBindings(array());
89+
$instanceofDef->setTags([]);
90+
$instanceofDef->setMethodCalls([]);
91+
$instanceofDef->setBindings([]);
9292

9393
if (isset($instanceofDef->getChanges()['shared'])) {
9494
$shared = $instanceofDef->isShared();
@@ -101,7 +101,7 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
101101
$abstract = $container->setDefinition('.abstract.instanceof.'.$id, $definition);
102102

103103
// cast Definition to ChildDefinition
104-
$definition->setBindings(array());
104+
$definition->setBindings([]);
105105
$definition = serialize($definition);
106106
$definition = substr_replace($definition, '53', 2, 2);
107107
$definition = substr_replace($definition, 'Child', 44, 0);
@@ -130,11 +130,11 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
130130

131131
// reset fields with "merge" behavior
132132
$abstract
133-
->setBindings(array())
134-
->setArguments(array())
135-
->setMethodCalls(array())
133+
->setBindings([])
134+
->setArguments([])
135+
->setMethodCalls([])
136136
->setDecoratedService(null)
137-
->setTags(array())
137+
->setTags([])
138138
->setAbstract(true);
139139
}
140140

@@ -144,7 +144,7 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
144144
private function mergeConditionals(array $autoconfiguredInstanceof, array $instanceofConditionals, ContainerBuilder $container)
145145
{
146146
// make each value an array of ChildDefinition
147-
$conditionals = array_map(function ($childDef) { return array($childDef); }, $autoconfiguredInstanceof);
147+
$conditionals = array_map(function ($childDef) { return [$childDef]; }, $autoconfiguredInstanceof);
148148

149149
foreach ($instanceofConditionals as $interface => $instanceofDef) {
150150
// make sure the interface/class exists (but don't validate automaticInstanceofConditionals)
@@ -153,7 +153,7 @@ private function mergeConditionals(array $autoconfiguredInstanceof, array $insta
153153
}
154154

155155
if (!isset($autoconfiguredInstanceof[$interface])) {
156-
$conditionals[$interface] = array();
156+
$conditionals[$interface] = [];
157157
}
158158

159159
$conditionals[$interface][] = $instanceofDef;

‎Compiler/ServiceLocatorTagPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ public static function register(ContainerBuilder $container, array $refMap, $cal
112112
// to derivate customized instances from the prototype one.
113113
$container->register($id .= '.'.$callerId, ServiceLocator::class)
114114
->setPublic(false)
115-
->setFactory(array(new Reference($locatorId), 'withContext'))
116-
->addTag('container.service_locator_context', array('id' => $callerId))
115+
->setFactory([new Reference($locatorId), 'withContext'])
116+
->addTag('container.service_locator_context', ['id' => $callerId])
117117
->addArgument($callerId)
118118
->addArgument(new Reference('service_container'));
119119
}

0 commit comments

Comments
 (0)