Skip to content

Commit 031ed19

Browse files
fabpotfabpot
committed
fixed CS
1 parent a799482 commit 031ed19

File tree

9 files changed

+247
-247
lines changed

9 files changed

+247
-247
lines changed

‎DataCollector/DoctrineDataCollector.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class DoctrineDataCollector extends DataCollector
3333
/**
3434
* @var DebugStack[]
3535
*/
36-
private $loggers = array();
36+
private $loggers = [];
3737

3838
public function __construct(ManagerRegistry $registry)
3939
{
@@ -58,24 +58,24 @@ public function addLogger($name, DebugStack $logger)
5858
*/
5959
public function collect(Request $request, Response $response, \Exception $exception = null)
6060
{
61-
$queries = array();
61+
$queries = [];
6262
foreach ($this->loggers as $name => $logger) {
6363
$queries[$name] = $this->sanitizeQueries($name, $logger->queries);
6464
}
6565

66-
$this->data = array(
66+
$this->data = [
6767
'queries' => $queries,
6868
'connections' => $this->connections,
6969
'managers' => $this->managers,
70-
);
70+
];
7171
}
7272

7373
public function reset()
7474
{
75-
$this->data = array();
75+
$this->data = [];
7676

7777
foreach ($this->loggers as $logger) {
78-
$logger->queries = array();
78+
$logger->queries = [];
7979
$logger->currentQuery = 0;
8080
}
8181
}
@@ -133,10 +133,10 @@ private function sanitizeQuery($connectionName, $query)
133133
{
134134
$query['explainable'] = true;
135135
if (null === $query['params']) {
136-
$query['params'] = array();
136+
$query['params'] = [];
137137
}
138138
if (!\is_array($query['params'])) {
139-
$query['params'] = array($query['params']);
139+
$query['params'] = [$query['params']];
140140
}
141141
foreach ($query['params'] as $j => $param) {
142142
if (isset($query['types'][$j])) {
@@ -180,26 +180,26 @@ private function sanitizeParam($var): array
180180
$className = \get_class($var);
181181

182182
return method_exists($var, '__toString') ?
183-
array(sprintf('/* Object(%s): */"%s"', $className, $var->__toString()), false) :
184-
array(sprintf('/* Object(%s) */', $className), false);
183+
[sprintf('/* Object(%s): */"%s"', $className, $var->__toString()), false] :
184+
[sprintf('/* Object(%s) */', $className), false];
185185
}
186186

187187
if (\is_array($var)) {
188-
$a = array();
188+
$a = [];
189189
$original = true;
190190
foreach ($var as $k => $v) {
191191
list($value, $orig) = $this->sanitizeParam($v);
192192
$original = $original && $orig;
193193
$a[$k] = $value;
194194
}
195195

196-
return array($a, $original);
196+
return [$a, $original];
197197
}
198198

199199
if (\is_resource($var)) {
200-
return array(sprintf('/* Resource(%s) */', get_resource_type($var)), false);
200+
return [sprintf('/* Resource(%s) */', get_resource_type($var)), false];
201201
}
202202

203-
return array($var, true);
203+
return [$var, true];
204204
}
205205
}

‎DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ abstract class AbstractDoctrineExtension extends Extension
2727
/**
2828
* Used inside metadata driver method to simplify aggregation of data.
2929
*/
30-
protected $aliasMap = array();
30+
protected $aliasMap = [];
3131

3232
/**
3333
* Used inside metadata driver method to simplify aggregation of data.
3434
*/
35-
protected $drivers = array();
35+
protected $drivers = [];
3636

3737
/**
3838
* @param array $objectManager A configured object manager
@@ -46,10 +46,10 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
4646
// automatically register bundle mappings
4747
foreach (array_keys($container->getParameter('kernel.bundles')) as $bundle) {
4848
if (!isset($objectManager['mappings'][$bundle])) {
49-
$objectManager['mappings'][$bundle] = array(
49+
$objectManager['mappings'][$bundle] = [
5050
'mapping' => true,
5151
'is_bundle' => true,
52-
);
52+
];
5353
}
5454
}
5555
}
@@ -59,11 +59,11 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
5959
continue;
6060
}
6161

62-
$mappingConfig = array_replace(array(
62+
$mappingConfig = array_replace([
6363
'dir' => false,
6464
'type' => false,
6565
'prefix' => false,
66-
), (array) $mappingConfig);
66+
], (array) $mappingConfig);
6767

6868
$mappingConfig['dir'] = $container->getParameterBag()->resolveValue($mappingConfig['dir']);
6969
// a bundle configuration is detected by realizing that the specified dir is not absolute and existing
@@ -153,7 +153,7 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re
153153
}
154154

155155
if (!$bundleConfig['dir']) {
156-
if (\in_array($bundleConfig['type'], array('annotation', 'staticphp'))) {
156+
if (\in_array($bundleConfig['type'], ['annotation', 'staticphp'])) {
157157
$bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingObjectDefaultName();
158158
} else {
159159
$bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingResourceConfigDirectory();
@@ -197,25 +197,25 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont
197197
}
198198
$mappingDriverDef->setArguments($args);
199199
} elseif ('annotation' == $driverType) {
200-
$mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), array(
200+
$mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), [
201201
new Reference($this->getObjectManagerElementName('metadata.annotation_reader')),
202202
array_values($driverPaths),
203-
));
203+
]);
204204
} else {
205-
$mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), array(
205+
$mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), [
206206
array_values($driverPaths),
207-
));
207+
]);
208208
}
209209
$mappingDriverDef->setPublic(false);
210210
if (false !== strpos($mappingDriverDef->getClass(), 'yml') || false !== strpos($mappingDriverDef->getClass(), 'xml')) {
211-
$mappingDriverDef->setArguments(array(array_flip($driverPaths)));
212-
$mappingDriverDef->addMethodCall('setGlobalBasename', array('mapping'));
211+
$mappingDriverDef->setArguments([array_flip($driverPaths)]);
212+
$mappingDriverDef->addMethodCall('setGlobalBasename', ['mapping']);
213213
}
214214

215215
$container->setDefinition($mappingService, $mappingDriverDef);
216216

217217
foreach ($driverPaths as $prefix => $driverPath) {
218-
$chainDriverDef->addMethodCall('addDriver', array(new Reference($mappingService), $prefix));
218+
$chainDriverDef->addMethodCall('addDriver', [new Reference($mappingService), $prefix]);
219219
}
220220
}
221221

@@ -240,7 +240,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
240240
throw new \InvalidArgumentException(sprintf('Specified non-existing directory "%s" as Doctrine mapping source.', $mappingConfig['dir']));
241241
}
242242

243-
if (!\in_array($mappingConfig['type'], array('xml', 'yml', 'annotation', 'php', 'staticphp'))) {
243+
if (!\in_array($mappingConfig['type'], ['xml', 'yml', 'annotation', 'php', 'staticphp'])) {
244244
throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or '.
245245
'"staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. '.
246246
'You can register them by adding a new driver to the '.
@@ -326,11 +326,11 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
326326
$cacheDef = new Definition($memcachedClass);
327327
$memcachedInstance = new Definition($memcachedInstanceClass);
328328
$memcachedInstance->setPrivate(true);
329-
$memcachedInstance->addMethodCall('addServer', array(
329+
$memcachedInstance->addMethodCall('addServer', [
330330
$memcachedHost, $memcachedPort,
331-
));
331+
]);
332332
$container->setDefinition($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManagerName)), $memcachedInstance);
333-
$cacheDef->addMethodCall('setMemcached', array(new Reference($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManagerName)))));
333+
$cacheDef->addMethodCall('setMemcached', [new Reference($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManagerName)))]);
334334
break;
335335
case 'redis':
336336
$redisClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.redis.class').'%';
@@ -340,11 +340,11 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
340340
$cacheDef = new Definition($redisClass);
341341
$redisInstance = new Definition($redisInstanceClass);
342342
$redisInstance->setPrivate(true);
343-
$redisInstance->addMethodCall('connect', array(
343+
$redisInstance->addMethodCall('connect', [
344344
$redisHost, $redisPort,
345-
));
345+
]);
346346
$container->setDefinition($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManagerName)), $redisInstance);
347-
$cacheDef->addMethodCall('setRedis', array(new Reference($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManagerName)))));
347+
$cacheDef->addMethodCall('setRedis', [new Reference($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManagerName)))]);
348348
break;
349349
case 'apc':
350350
case 'apcu':
@@ -373,7 +373,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
373373
$cacheDriver['namespace'] = $namespace;
374374
}
375375

376-
$cacheDef->addMethodCall('setNamespace', array($cacheDriver['namespace']));
376+
$cacheDef->addMethodCall('setNamespace', [$cacheDriver['namespace']]);
377377

378378
$container->setDefinition($cacheDriverServiceId, $cacheDef);
379379

@@ -396,10 +396,10 @@ protected function fixManagersAutoMappings(array $managerConfigs, array $bundles
396396
continue 2;
397397
}
398398
}
399-
$managerConfigs[$autoMappedManager]['mappings'][$bundle] = array(
399+
$managerConfigs[$autoMappedManager]['mappings'][$bundle] = [
400400
'mapping' => true,
401401
'is_bundle' => true,
402-
);
402+
];
403403
}
404404
$managerConfigs[$autoMappedManager]['auto_mapping'] = false;
405405
}

‎DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
117117
* register alias
118118
* @param string[] $aliasMap Map of alias to namespace
119119
*/
120-
public function __construct($driver, array $namespaces, array $managerParameters, string $driverPattern, $enabledParameter = false, string $configurationPattern = '', string $registerAliasMethodName = '', array $aliasMap = array())
120+
public function __construct($driver, array $namespaces, array $managerParameters, string $driverPattern, $enabledParameter = false, string $configurationPattern = '', string $registerAliasMethodName = '', array $aliasMap = [])
121121
{
122122
$this->driver = $driver;
123123
$this->namespaces = $namespaces;
@@ -146,7 +146,7 @@ public function process(ContainerBuilder $container)
146146
// Definition for a Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain
147147
$chainDriverDef = $container->getDefinition($chainDriverDefService);
148148
foreach ($this->namespaces as $namespace) {
149-
$chainDriverDef->addMethodCall('addDriver', array($mappingDriverDef, $namespace));
149+
$chainDriverDef->addMethodCall('addDriver', [$mappingDriverDef, $namespace]);
150150
}
151151

152152
if (!\count($this->aliasMap)) {
@@ -157,7 +157,7 @@ public function process(ContainerBuilder $container)
157157
// Definition of the Doctrine\...\Configuration class specific to the Doctrine flavour.
158158
$configurationServiceDefinition = $container->getDefinition($configurationServiceName);
159159
foreach ($this->aliasMap as $alias => $namespace) {
160-
$configurationServiceDefinition->addMethodCall($this->registerAliasMethodName, array($alias, $namespace));
160+
$configurationServiceDefinition->addMethodCall($this->registerAliasMethodName, [$alias, $namespace]);
161161
}
162162
}
163163

‎Form/DoctrineOrmTypeGuesser.php

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
2626
{
2727
protected $registry;
2828

29-
private $cache = array();
29+
private $cache = [];
3030

3131
public function __construct(ManagerRegistry $registry)
3232
{
@@ -39,7 +39,7 @@ public function __construct(ManagerRegistry $registry)
3939
public function guessType($class, $property)
4040
{
4141
if (!$ret = $this->getMetadata($class)) {
42-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
42+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', [], Guess::LOW_CONFIDENCE);
4343
}
4444

4545
list($metadata, $name) = $ret;
@@ -48,44 +48,44 @@ public function guessType($class, $property)
4848
$multiple = $metadata->isCollectionValuedAssociation($property);
4949
$mapping = $metadata->getAssociationMapping($property);
5050

51-
return new TypeGuess('Symfony\Bridge\Doctrine\Form\Type\EntityType', array('em' => $name, 'class' => $mapping['targetEntity'], 'multiple' => $multiple), Guess::HIGH_CONFIDENCE);
51+
return new TypeGuess('Symfony\Bridge\Doctrine\Form\Type\EntityType', ['em' => $name, 'class' => $mapping['targetEntity'], 'multiple' => $multiple], Guess::HIGH_CONFIDENCE);
5252
}
5353

5454
switch ($metadata->getTypeOfField($property)) {
5555
case Type::TARRAY:
56-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', array(), Guess::MEDIUM_CONFIDENCE);
56+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', [], Guess::MEDIUM_CONFIDENCE);
5757
case Type::BOOLEAN:
58-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', array(), Guess::HIGH_CONFIDENCE);
58+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', [], Guess::HIGH_CONFIDENCE);
5959
case Type::DATETIME:
6060
case Type::DATETIMETZ:
6161
case 'vardatetime':
62-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', array(), Guess::HIGH_CONFIDENCE);
62+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', [], Guess::HIGH_CONFIDENCE);
6363
case 'datetime_immutable':
6464
case 'datetimetz_immutable':
65-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', array('input' => 'datetime_immutable'), Guess::HIGH_CONFIDENCE);
65+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', ['input' => 'datetime_immutable'], Guess::HIGH_CONFIDENCE);
6666
case 'dateinterval':
67-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateIntervalType', array(), Guess::HIGH_CONFIDENCE);
67+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateIntervalType', [], Guess::HIGH_CONFIDENCE);
6868
case Type::DATE:
69-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', array(), Guess::HIGH_CONFIDENCE);
69+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', [], Guess::HIGH_CONFIDENCE);
7070
case 'date_immutable':
71-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', array('input' => 'datetime_immutable'), Guess::HIGH_CONFIDENCE);
71+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', ['input' => 'datetime_immutable'], Guess::HIGH_CONFIDENCE);
7272
case Type::TIME:
73-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TimeType', array(), Guess::HIGH_CONFIDENCE);
73+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TimeType', [], Guess::HIGH_CONFIDENCE);
7474
case 'time_immutable':
75-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TimeType', array('input' => 'datetime_immutable'), Guess::HIGH_CONFIDENCE);
75+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TimeType', ['input' => 'datetime_immutable'], Guess::HIGH_CONFIDENCE);
7676
case Type::DECIMAL:
7777
case Type::FLOAT:
78-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', array(), Guess::MEDIUM_CONFIDENCE);
78+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', [], Guess::MEDIUM_CONFIDENCE);
7979
case Type::INTEGER:
8080
case Type::BIGINT:
8181
case Type::SMALLINT:
82-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', array(), Guess::MEDIUM_CONFIDENCE);
82+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', [], Guess::MEDIUM_CONFIDENCE);
8383
case Type::STRING:
84-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::MEDIUM_CONFIDENCE);
84+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', [], Guess::MEDIUM_CONFIDENCE);
8585
case Type::TEXT:
86-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextareaType', array(), Guess::MEDIUM_CONFIDENCE);
86+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextareaType', [], Guess::MEDIUM_CONFIDENCE);
8787
default:
88-
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
88+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', [], Guess::LOW_CONFIDENCE);
8989
}
9090
}
9191

@@ -140,7 +140,7 @@ public function guessMaxLength($class, $property)
140140
return new ValueGuess($mapping['length'], Guess::HIGH_CONFIDENCE);
141141
}
142142

143-
if (\in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
143+
if (\in_array($ret[0]->getTypeOfField($property), [Type::DECIMAL, Type::FLOAT])) {
144144
return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
145145
}
146146
}
@@ -153,7 +153,7 @@ public function guessPattern($class, $property)
153153
{
154154
$ret = $this->getMetadata($class);
155155
if ($ret && isset($ret[0]->fieldMappings[$property]) && !$ret[0]->hasAssociation($property)) {
156-
if (\in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
156+
if (\in_array($ret[0]->getTypeOfField($property), [Type::DECIMAL, Type::FLOAT])) {
157157
return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
158158
}
159159
}
@@ -171,7 +171,7 @@ protected function getMetadata($class)
171171
$this->cache[$class] = null;
172172
foreach ($this->registry->getManagers() as $name => $em) {
173173
try {
174-
return $this->cache[$class] = array($em->getClassMetadata($class), $name);
174+
return $this->cache[$class] = [$em->getClassMetadata($class), $name];
175175
} catch (MappingException $e) {
176176
// not an entity or mapped super class
177177
} catch (LegacyMappingException $e) {

0 commit comments

Comments
 (0)